X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile;h=e959e4e4636c9c2300d553d43c775f8a03130a85;hb=a410368d7ed203c59512c77832c4b0cab4a42e05;hp=a6f6e42381dead199d49606e5ec07f997b19fa7b;hpb=45982a9894c5bff60ff494a0f82865ec267d52f7;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index a6f6e423..e959e4e4 100644
--- a/makefile
+++ b/makefile
@@ -1,67 +1,112 @@
-#uncomment one of these according to your sound driver
-#if you use ALSA version 0.9.x
-#SND=snd_alsa_0_9.o
-#SOUNDLIB=-lasound
-#if you use ALSA version 0.5.x
-SND=snd_alsa_0_5.o
-SOUNDLIB=-lasound
-#if you use the kernel sound driver or OSS
-#SND=snd_oss.o
-#SOUNDLIB=
-
-OBJECTS= buildnumber.o cd_linux.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cl_tent.o cmd.o common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o gl_poly.o gl_rmain.o gl_rmisc.o gl_rsurf.o gl_screen.o gl_warp.o host.o host_cmd.o image.o keys.o mathlib.o menu.o model_alias.o model_brush.o model_shared.o model_sprite.o net_bsd.o net_udp.o net_dgrm.o net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o r_part.o r_explosion.o sbar.o snd_dma.o snd_mem.o snd_mix.o $(SND) sv_main.o sv_move.o sv_phys.o sv_user.o sv_light.o sys_linux.o transform.o view.o wad.o world.o zone.o vid_shared.o palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o r_modules.o r_explosion.o r_lerpanim.o cl_effects.o r_decals.o protocol.o quakeio.o r_clip.o ui.o portals.o sys_shared.o cl_light.o
-
-#K6/athlon optimizations
-CPUOPTIMIZATIONS=-march=k6
-#686 optimizations
-#CPUOPTIMIZATIONS=-march=i686
-
-#use this line for profiling
-PROFILEOPTION=-pg -g
-NOPROFILEOPTIMIZATIONS=
-#use this line for no profiling
-#PROFILEOPTION=
-#NOPROFILEOPTIMIZATIONS=-fomit-frame-pointer
-
-#note:
-#the -Werror can be removed to compile even if there are warnings,
-#this is used to ensure that all released versions are free of warnings.
-
-#normal compile
-OPTIMIZATIONS= -O6 -ffast-math -funroll-loops $(NOPROFILEOPTIMIZATIONS) -fexpensive-optimizations $(CPUOPTIMIZATIONS)
-CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -I/usr/include/glide $(OPTIMIZATIONS) $(PROFILEOPTION)
-#debug compile
-#OPTIMIZATIONS= -O -g
-#CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS) $(PROFILEOPTION)
-
-LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl $(SOUNDLIB) -lz $(PROFILEOPTION)
-
-#most people can't build the -3dfx version (-3dfx version needs some updates for new mesa)
-all: buildnum darkplaces-glx
-#all: darkplaces-glx darkplaces-3dfx
-
-buildnum/buildnum:
-	cd buildnum
-	make
-	cd ..
-
-buildnum: buildnum/buildnum
-	buildnum/buildnum buildnumber.c
-
-.c.o:
-	gcc $(CFLAGS) -c $*.c
-
-darkplaces-glx: $(OBJECTS) vid_glx.o
-	gcc -o $@ $^ $(LDFLAGS)
-
-darkplaces-3dfx: $(OBJECTS) in_svgalib.o vid_3dfxsvga.o
-	gcc -o $@ $^ $(LDFLAGS)
-
-
-clean:
-	-rm -f darkplaces-glx darkplaces-3dfx
-	-rm -f vid_glx.o in_svgalib.o vid_3dfxsvga.o $(OBJECTS) *.d
-
-.PHONY: clean buildnum
+#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
+
+ifndef DP_MAKE_TARGET
+
+# Win32
+ifdef windir
+	DP_MAKE_TARGET=mingw
+else
+
+# UNIXes
+DP_ARCH:=$(shell uname)
+ifneq ($(filter %BSD,$(DP_ARCH)),)
+	DP_MAKE_TARGET=bsd
+else
+	DP_MAKE_TARGET=linux
+endif
+
+endif
+
+endif
+
+# If we're not on compiling for Win32, we need additional information
+ifneq ($(DP_MAKE_TARGET), mingw)
+	DP_ARCH:=$(shell uname)
+	DP_MACHINE:=$(shell uname -m)
+endif
+
+
+# Command used to delete files
+ifdef windir
+	CMD_RM=del
+else
+	CMD_RM=$(CMD_UNIXRM)
+endif
+
+# 64bits AMD CPUs use another lib directory
+ifeq ($(DP_MACHINE),x86_64)
+	UNIX_X11LIBPATH:=-L/usr/X11R6/lib64
+else
+	UNIX_X11LIBPATH:=-L/usr/X11R6/lib
+endif
+
+
+# Linux configuration
+ifeq ($(DP_MAKE_TARGET), linux)
+	OBJ_SOUND=$(OBJ_LINUXSOUND)
+	LIB_SOUND=$(LIB_LINUXSOUND)
+	OBJ_CD=$(OBJ_LINUXCD)
+
+	OBJ_CL=$(OBJ_GLX)
+
+	LDFLAGS_CL=$(LDFLAGS_LINUXCL)
+	LDFLAGS_SV=$(LDFLAGS_LINUXSV)
+	LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
+
+	EXE_CL=$(EXE_UNIXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+endif
+
+# BSD configuration
+ifeq ($(DP_MAKE_TARGET), bsd)
+ifeq ($(DP_ARCH),FreeBSD)
+	OBJ_SOUND=$(OBJ_OSSSOUND)
+	LIB_SOUND=$(LIB_OSSSOUND)
+else
+	OBJ_SOUND=$(OBJ_BSDSOUND)
+	LIB_SOUND=$(LIB_BSDSOUND)
+endif
+	OBJ_CD=$(OBJ_BSDCD)
+
+	OBJ_CL=$(OBJ_GLX)
+
+	LDFLAGS_CL=$(LDFLAGS_BSDCL)
+	LDFLAGS_SV=$(LDFLAGS_BSDSV)
+	LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
+
+	EXE_CL=$(EXE_UNIXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+endif
+
+# Win32 configuration
+ifeq ($(DP_MAKE_TARGET), mingw)
+	OBJ_SOUND=$(OBJ_WINSOUND)
+	LIB_SOUND=$(LIB_WINSOUND)
+	OBJ_CD=$(OBJ_WINCD)
+
+	OBJ_CL=$(OBJ_WGL)
+
+	LDFLAGS_CL=$(LDFLAGS_WINCL)
+	LDFLAGS_SV=$(LDFLAGS_WINSV)
+	LDFLAGS_SDL=$(LDFLAGS_WINSDL)
+
+	EXE_CL=$(EXE_WINCL)
+	EXE_SV=$(EXE_WINSV)
+	EXE_SDL=$(EXE_WINSDL)
+endif
+
+
+##### GNU Make specific definitions #####
+
+DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
+
+
+##### Definitions shared by all makefiles #####
+include makefile.inc
+
+
+##### Dependency files #####
 
 -include *.d