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

diff --git a/makefile b/makefile
index fff672e4..e959e4e4 100644
--- a/makefile
+++ b/makefile
@@ -1,78 +1,112 @@
+#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
 
+ifndef DP_MAKE_TARGET
 
-#uncomment these according to your sound driver
-
-#recommended for: anyone not using ALSA 0.5
-SND=snd_oss.o snd_dma.o snd_mix.o snd_mem.o
-SOUNDLIB=
-#recommended for: anyone using ALSA 0.5
-#SND=snd_alsa_0_5.o snd_dma.o snd_mix.o snd_mem.o
-#SOUNDLIB=-lasound
-#recommended for: no one (this driver needs to be updated, it doesn't compile anymore)
-#SND=snd_alsa_0_9.o snd_dma.o snd_mix.o snd_mem.o
-#SOUNDLIB=-lasound
-#recommended for: anyone who can't use the above drivers
-#SND=snd_null.o
-#SOUNDLIB=
-
-
-#uncomment your preference
-#if you want CD sound in Linux
-#CD=cd_linux.o
-#if you want no CD audio
-CD=cd_null.o
-
-OBJECTS= builddate.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 r_sky.o gl_rmain.o gl_rsurf.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_explosion.o sbar.o 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 protocol.o quakeio.o ui.o portals.o sys_shared.o cl_light.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o dpvsimpledecode.o wavefile.o meshqueue.o
-
-#K6/athlon optimizations
-#CPUOPTIMIZATIONS=-march=k6
-#note: don't use -march=athlon, every gcc which has it currently (2.96-3.1)
-#have optimizer bugs (like entities disappearing randomly - a bug with
-#compiling BOX_ON_PLANE_SIDE in mathlib.h)
-#CPUOPTIMIZATIONS=-march=athlon
-#686 optimizations
-#CPUOPTIMIZATIONS=-march=i686
-#no specific CPU
-CPUOPTIMIZATIONS=
-
-#use this line for profiling
-PROFILEOPTION=-pg -g
-NOPROFILEOPTIMIZATIONS=
-#use this line for no profiling
-#PROFILEOPTION=
-#NOPROFILEOPTIMIZATIONS=-fomit-frame-pointer
-#use these lines for debugging without profiling
-#PROFILEOPTION=
-#NOPROFILEOPTIMIZATIONS=
-
-#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 -fno-strict-aliasing -ffast-math -funroll-loops $(NOPROFILEOPTIMIZATIONS) -fexpensive-optimizations $(CPUOPTIMIZATIONS)
-CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include $(OPTIMIZATIONS) $(PROFILEOPTION)
-#debug compile
-#OPTIMIZATIONS=
-#CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS) $(PROFILEOPTION)
-
-LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXxf86dga -lXxf86vm -ldl $(SOUNDLIB) $(PROFILEOPTION)
-
-all: builddate darkplaces-glx
-
-builddate:
-	touch builddate.c
-
-.c.o:
-	gcc $(CFLAGS) -c $*.c
-
-darkplaces-glx: vid_glx.o $(CD) $(SND) $(OBJECTS)
-	gcc -o $@ $^ $(LDFLAGS)
-
-clean:
-	-rm -f darkplaces-glx *.o *.d
-
-.PHONY: clean builddate
+# Win32
+ifdef windir
+	DP_MAKE_TARGET=mingw
+else
 
--include *.d
+# 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