X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=299893bae932d5d0999f98d51436e3db72638fbf;hp=2b2b623c4efabcaa8155a9d356b7483493920fbc;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hpb=6bcce2962b3a088bd816d473efebe71ac677dc99

diff --git a/makefile b/makefile
index 2b2b623c..299893ba 100644
--- a/makefile
+++ b/makefile
@@ -1,82 +1,192 @@
+#####  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
+ifeq ($(DP_ARCH), Darwin)
+	DP_MAKE_TARGET=macosx
+else
+ifeq ($(DP_ARCH), SunOS)
+	DP_MAKE_TARGET=sunos
+else
+	DP_MAKE_TARGET=linux
+
+endif  # ifeq ($(DP_ARCH), SunOS)
+endif  # ifeq ($(DP_ARCH), Darwin)
+endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
+endif  # ifdef windir
+endif  # ifndef DP_MAKE_TARGET
+
+# 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)
+	DEFAULT_SNDAPI=ALSA
+	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
+
+# Mac OS X configuration
+ifeq ($(DP_MAKE_TARGET), macosx)
+	DEFAULT_SNDAPI=COREAUDIO
+	OBJ_CD=$(OBJ_MACOSXCD)
+
+	OBJ_CL=$(OBJ_AGL)
+
+	LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
+	LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
+	LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
+
+	EXE_CL=$(EXE_UNIXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+endif
+
+# SunOS configuration (Solaris)
+ifeq ($(DP_MAKE_TARGET), sunos)
+	DEFAULT_SNDAPI=OSS
+	OBJ_CD=$(OBJ_SUNOSCD)
+
+	OBJ_CL=$(OBJ_GLX)
+
+	CFLAGS_EXTRA=$(CFLAGS_SUNOS)
 
+	LDFLAGS_CL=$(LDFLAGS_SUNOSCL)
+	LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
+	LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
 
-#uncomment these according to your sound driver
+	EXE_CL=$(EXE_UNIXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+endif
 
-#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=
+# BSD configuration
+ifeq ($(DP_MAKE_TARGET), bsd)
+ifeq ($(DP_ARCH),FreeBSD)
+	DEFAULT_SNDAPI=OSS
+else
+	DEFAULT_SNDAPI=BSD
+endif
+	OBJ_CD=$(OBJ_BSDCD)
 
+	OBJ_CL=$(OBJ_GLX)
+
+	LDFLAGS_CL=$(LDFLAGS_BSDCL)
+	LDFLAGS_SV=$(LDFLAGS_BSDSV)
+	LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
-#uncomment your preference
-#if you want CD sound in Linux
-#CD=cd_linux.o
-#if you want no CD audio
-CD=cd_null.o
+	EXE_CL=$(EXE_UNIXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+endif
 
-CLIENTOBJECTS= cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o cl_main.o cl_parse.o cl_particles.o cl_screen.o cl_video.o console.o dpvsimpledecode.o fractalnoise.o gl_backend.o gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o r_explosion.o r_lerpanim.o r_light.o r_modules.o r_sky.o r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o r_shadow.c
-SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o sv_phys.o sv_user.o
-SHAREDOBJECTS= builddate.o cmd.o collision.o common.o crc.o cvar.o filematch.o host.o host_cmd.o image.o mathlib.o matrixlib.o model_alias.o model_brush.o model_shared.o model_sprite.o net_bsd.o net_dgrm.o net_loop.o net_main.o net_master.o net_udp.o palette.o portals.o protocol.o quakeio.o sys_linux.o sys_shared.o transform.o world.o wad.o zone.o $(NETOBJECTS) $(SERVEROBJECTS)
+# Win32 configuration
+ifeq ($(DP_MAKE_TARGET), mingw)
+	DEFAULT_SNDAPI=WIN
+	OBJ_CD=$(OBJ_WINCD)
 
+	OBJ_CL=$(OBJ_WGL)
 
-#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=
+	LDFLAGS_CL=$(LDFLAGS_WINCL)
+	LDFLAGS_SV=$(LDFLAGS_WINSV)
+	LDFLAGS_SDL=$(LDFLAGS_WINSDL)
 
-#use this line for profiling
-PROFILEOPTION=-pg -g
-#use this line for no profiling
-#PROFILEOPTION=
+	EXE_CL=$(EXE_WINCL)
+	EXE_SV=$(EXE_WINSV)
+	EXE_SDL=$(EXE_WINSDL)
+endif
 
-#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 -fexpensive-optimizations $(CPUOPTIMIZATIONS)
-CFLAGS= -MD -Wall -Werror $(OPTIMIZATIONS) $(PROFILEOPTION)
-#debug compile
-#OPTIMIZATIONS=
-#CFLAGS= -MD -Wall -Werror -ggdb $(OPTIMIZATIONS) $(PROFILEOPTION)
+##### Sound configuration #####
 
-LDFLAGS= $(PROFILEOPTION) -lm -ldl
+ifndef DP_SOUND_API
+	DP_SOUND_API=$(DEFAULT_SNDAPI)
+endif
 
-all: builddate darkplaces-dedicated darkplaces-glx
+# NULL: no sound
+ifeq ($(DP_SOUND_API), NULL)
+	OBJ_SOUND=$(OBJ_SND_NULL)
+	LIB_SOUND=$(LIB_SND_NULL)
+endif
 
-builddate:
-	touch builddate.c
+# OSS: Open Sound System
+ifeq ($(DP_SOUND_API), OSS)
+	OBJ_SOUND=$(OBJ_SND_OSS)
+	LIB_SOUND=$(LIB_SND_OSS)
+endif
 
-vid_glx.o: vid_glx.c
-	gcc $(CFLAGS) -c vid_glx.c -I/usr/X11R6/include
+# ALSA: Advanced Linux Sound Architecture
+ifeq ($(DP_SOUND_API), ALSA)
+	OBJ_SOUND=$(OBJ_SND_ALSA)
+	LIB_SOUND=$(LIB_SND_ALSA)
+endif
 
-.c.o:
-	gcc $(CFLAGS) -c $*.c
+# COREAUDIO: Core Audio
+ifeq ($(DP_SOUND_API), COREAUDIO)
+	OBJ_SOUND=$(OBJ_SND_COREAUDIO)
+	LIB_SOUND=$(LIB_SND_COREAUDIO)
+endif
 
-darkplaces-glx:  $(SHAREDOBJECTS) $(CLIENTOBJECTS) $(SERVEROBJECTS) vid_glx.o $(CD) $(SND)
-	gcc -o $@ $^ $(LDFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(SOUNDLIB)
+# BSD: BSD / Sun audio API
+ifeq ($(DP_SOUND_API), BSD)
+	OBJ_SOUND=$(OBJ_SND_BSD)
+	LIB_SOUND=$(LIB_SND_BSD)
+endif
 
-darkplaces-dedicated: $(SHAREDOBJECTS) $(CLIENTOBJECTS) $(SERVEROBJECTS) vid_null.o cd_null.o snd_null.o
-	gcc -o $@ $^ $(LDFLAGS)
+# WIN: DirectX and Win32 WAVE output
+ifeq ($(DP_SOUND_API), WIN)
+	OBJ_SOUND=$(OBJ_SND_WIN)
+	LIB_SOUND=$(LIB_SND_WIN)
+endif
 
-clean:
-	-rm -f darkplaces-glx darkplaces-dedicated *.o *.d
 
-.PHONY: clean builddate
+##### GNU Make specific definitions #####
 
--include *.d
+DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
+
+
+##### Definitions shared by all makefiles #####
+include makefile.inc
 
+
+##### Dependency files #####
+
+-include *.d