X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=38a162587a46992cad3614348a5776f17adc0619;hp=b3eaf5d046858b761eaa2ac6df46ca7a7d4d26f4;hb=dd0b4a35240b6b0e8612e41af439ead7981ec8cd;hpb=2c3c723edde745a28346d549658f08998e006525 diff --git a/makefile.inc b/makefile.inc index b3eaf5d0..38a16258 100644 --- a/makefile.inc +++ b/makefile.inc @@ -1,34 +1,44 @@ +# Invalid call detection +CHECKLEVEL1 = @if [ "$(LEVEL)" != 1 ]; then $(MAKE) help; false; fi +CHECKLEVEL2 = @if [ "$(LEVEL)" != 2 ]; then $(MAKE) help; false; fi + # Choose the compiler you want to use CC=gcc # athlon optimizations -#CPUOPTIMIZATIONS=-march=athlon +#CPUOPTIMIZATIONS?=-march=athlon # athlon xp optimizations -#CPUOPTIMIZATIONS=-march=athlon-xp +#CPUOPTIMIZATIONS?=-march=athlon-xp # athlon 64 optimizations -#CPUOPTIMIZATIONS=-march=athlon64 -m32 +#CPUOPTIMIZATIONS?=-march=athlon64 -m32 # Pentium 3 optimizations -#CPUOPTIMIZATIONS=-march=pentium3 +#CPUOPTIMIZATIONS?=-march=pentium3 # Pentium 4 optimizations -#CPUOPTIMIZATIONS=-march=pentium4 +#CPUOPTIMIZATIONS?=-march=pentium4 # 686 (Pentium Pro/II) optimizations -#CPUOPTIMIZATIONS=-march=i686 +#CPUOPTIMIZATIONS?=-march=i686 # No specific CPU (386 compatible) -CPUOPTIMIZATIONS= +CPUOPTIMIZATIONS?= +# Experimental +#CPUOPTIMIZATIONS?=-fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fassociative-math -freciprocal-math -fno-signed-zeros -fno-trapping-math SDL_CONFIG?=sdl-config SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags` SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs` SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs` -SDLCONFIG_MACOSXCFLAGS= -SDLCONFIG_MACOSXLIBS=-framework SDL -framework Cocoa -SDLCONFIG_MACOSXSTATICLIBS=-framework SDL -framework Cocoa +SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers +SDLCONFIG_MACOSXLIBS=-framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) +SDLCONFIG_MACOSXSTATICLIBS=-framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) STRIP?=strip ###### Sound and audio CD ##### -OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o +OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o snd_modplug.o + +# Additional stuff for libmodplug +LIB_SND_MODPLUG=`[ -n "$(DP_MODPLUG_STATIC_LIBDIR)" ] && echo \ $(DP_MODPLUG_STATIC_LIBDIR)/libmodplug.a\ -lstdc++` +CFLAGS_SND_MODPLUG=`[ -n "$(DP_MODPLUG_STATIC_LIBDIR)" ] && echo \ -I$(DP_MODPLUG_STATIC_LIBDIR)/../include\ -DSND_MODPLUG_STATIC` # No sound OBJ_SND_NULL=snd_null.o @@ -36,24 +46,27 @@ LIB_SND_NULL= # Open Sound System (Linux, FreeBSD and Solaris) OBJ_SND_OSS=$(OBJ_SND_COMMON) snd_oss.o -LIB_SND_OSS= +LIB_SND_OSS=$(LIB_SND_MODPLUG) # Advanced Linux Sound Architecture (Linux) OBJ_SND_ALSA=$(OBJ_SND_COMMON) snd_alsa.o -LIB_SND_ALSA=-lasound +LIB_SND_ALSA=-lasound $(LIB_SND_MODPLUG) # Core Audio (Mac OS X) -OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c -LIB_SND_COREAUDIO=-framework CoreAudio +OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.o +LIB_SND_COREAUDIO=-framework CoreAudio $(LIB_SND_MODPLUG) # BSD / Sun audio API (NetBSD and OpenBSD) OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o -LIB_SND_BSD= +LIB_SND_BSD=$(LIB_SND_MODPLUG) # DirectX and Win32 WAVE output (Win32) OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o -LIB_SND_WIN= +LIB_SND_WIN=$(LIB_SND_MODPLUG) +# Qantourisc's 3D Realtime Acoustic Lib (3D RAS) +OBJ_SND_3DRAS=snd_3dras.o +LIB_SND_3DRAS= # CD objects OBJ_NOCD=cd_null.o @@ -66,6 +79,8 @@ OBJ_COMMON= \ cd_shared.o \ cl_collision.o \ cl_demo.o \ + cl_dyntexture.o \ + cl_gecko.o \ cl_input.o \ cl_main.o \ cl_parse.o \ @@ -117,7 +132,6 @@ OBJ_COMMON= \ prvm_exec.o \ r_explosion.o \ r_lerpanim.o \ - r_light.o \ r_lightning.o \ r_modules.o \ r_shadow.o \ @@ -162,9 +176,9 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@ # Link -LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE) -LDFLAGS_RELEASE=$(OPTIM_RELEASE) +LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=debug +LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=profile +LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release ##### UNIX specific variables ##### @@ -173,12 +187,12 @@ OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) LDFLAGS_UNIXCOMMON=-lm LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) -LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl +LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl -lmodplug LDFLAGS_UNIXSV_PRELOAD=-lz -lcurl -LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl +LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl -lmodplug CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD -LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) +LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) $(LIB_SND_MODPLUG) EXE_UNIXCL=darkplaces-glx EXE_UNIXSV=darkplaces-dedicated EXE_UNIXSDL=darkplaces-sdl @@ -197,9 +211,9 @@ OBJ_LINUXCD=cd_linux.o #OBJ_LINUXCD=$(OBJ_NOCD) # Link -LDFLAGS_LINUXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL) -LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -ldl -LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL) +LDFLAGS_LINUXCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXCL) +LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl +LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL) ##### Mac OS X specific variables ##### @@ -226,9 +240,9 @@ OBJ_SUNOSCD=$(OBJ_NOCD) CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS # Link -LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm $(LIB_SOUND) -LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl -LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) +LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm $(LIB_SOUND) +LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl +LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) ##### BSD specific variables ##### @@ -240,7 +254,7 @@ OBJ_BSDCD=cd_bsd.o # Link LDFLAGS_BSDCL=$(LDFLAGS_UNIXCOMMON) -lutil $(LDFLAGS_UNIXCL) -LDFLAGS_BSDSV=$(LDFLAGS_UNIXCOMMON) +LDFLAGS_BSDSV=$(LDFLAGS_UNIXCOMMON) LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) @@ -252,14 +266,14 @@ OBJ_WINCD=cd_win.o #if you want no CD audio #OBJ_WINCD=$(OBJ_NOCD) -OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) +OBJ_WGL= builddate.c sys_win.o vid_wgl.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) # Link # Note that Windows Vista users may need --large-address-aware because Vista seems to map over 500MB of application address space for its own purposes, which is a significant chunk taken out of the default 2GB address space, this option raises the limit to 4GB (or 3GB on Vista 32 and older versions of Windows). LDFLAGS_WINCOMMON=-lws2_32 -Wl,--large-address-aware LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -lwinmm -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole -lwinmm -LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(SDLCONFIG_LIBS) +LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(SDLCONFIG_LIBS) $(LIB_SND_MODPLUG) EXE_WINCL=darkplaces.exe EXE_WINSV=darkplaces-dedicated.exe EXE_WINSDL=darkplaces-sdl.exe @@ -314,128 +328,153 @@ nexuiz : cl-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" + EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1 cl-profile : $(MAKE) bin-profile \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" + EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1 cl-release : $(MAKE) bin-release \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" + EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1 cl-nexuiz : $(MAKE) bin-release \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)" + EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1 sv-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" + EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 sv-profile : $(MAKE) bin-profile \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" + EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 sv-release : $(MAKE) bin-release \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" + EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 sv-nexuiz : $(MAKE) bin-release \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)" + EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 sdl-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" + EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 sdl-profile : $(MAKE) bin-profile \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" + EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 sdl-release : $(MAKE) bin-release \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" + EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 sdl-nexuiz : $(MAKE) bin-release \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" + EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 bin-debug : + $(CHECKLEVEL1) @echo @echo "========== $(EXE) (debug) ==========" $(MAKE) $(EXE) \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ - LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" + LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" LEVEL=2 bin-profile : + $(CHECKLEVEL1) @echo @echo "========== $(EXE) (profile) ==========" $(MAKE) $(EXE) \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" + LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" LEVEL=2 bin-release : + $(CHECKLEVEL1) @echo @echo "========== $(EXE) (release) ==========" $(MAKE) $(EXE) \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" + LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2 $(STRIP) $(EXE) +snd_modplug.o: snd_modplug.c + $(CHECKLEVEL2) + $(DO_CC) $(CFLAGS_SND_MODPLUG) + vid_glx.o: vid_glx.c + $(CHECKLEVEL2) $(DO_CC) -I/usr/X11R6/include vid_sdl.o: vid_sdl.c + $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_SDL) sys_sdl.o: sys_sdl.c + $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_SDL) snd_sdl.o: snd_sdl.c + $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_SDL) +snd_3dras.o: snd_3dras.c + $(CHECKLEVEL2) + $(DO_CC) + cd_sdl.o: cd_sdl.c + $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_SDL) darkplaces.o: %.o : %.rc + $(CHECKLEVEL2) $(WINDRES) -o $@ $< nexuiz.o: %.o : %.rc + $(CHECKLEVEL2) $(WINDRES) -o $@ $< .c.o: + $(CHECKLEVEL2) $(DO_CC) $(EXE_CL): $(OBJ_CL) $(OBJ_ICON) + $(CHECKLEVEL2) $(DO_LD) $(EXE_SV): $(OBJ_SV) $(OBJ_ICON) + $(CHECKLEVEL2) $(DO_LD) $(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON) + $(CHECKLEVEL2) $(DO_LD) $(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ) + $(CHECKLEVEL2) $(DO_LD) $(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ) + $(CHECKLEVEL2) $(DO_LD) $(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ) + $(CHECKLEVEL2) $(DO_LD) clean: