X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=2567612543e010e2aba67c906602f4de789a7e75;hp=c3c18ae6a1dac5b9b51e3032754f28f04ad3aa23;hb=HEAD;hpb=97b79884ee55276e90c4dd60f9bfde8b9dbbff68 diff --git a/makefile.inc b/makefile.inc index c3c18ae6..33cbc043 100644 --- a/makefile.inc +++ b/makefile.inc @@ -2,105 +2,54 @@ 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 -# athlon xp optimizations -#CPUOPTIMIZATIONS?=-march=athlon-xp -# athlon 64 optimizations -#CPUOPTIMIZATIONS?=-march=athlon64 -m32 -# Pentium 3 optimizations -#CPUOPTIMIZATIONS?=-march=pentium3 -# Pentium 4 optimizations -#CPUOPTIMIZATIONS?=-march=pentium4 -# 686 (Pentium Pro/II) optimizations -#CPUOPTIMIZATIONS?=-march=i686 -# No specific CPU (386 compatible) -#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 -# Normal -CPUOPTIMIZATIONS?=-fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math -# NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag -SDL_CONFIG?=sdl-config -SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags` -SDLCONFIG_UNIXCFLAGS_X11?= -SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs` -SDLCONFIG_UNIXLIBS_X11?=-lX11 -SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs` -SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11 -SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers -I$(HOME)/Library/Frameworks/SDL.framework/Headers -SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) -SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) STRIP?=strip -###### Sound and audio CD ##### +###### Sound ##### -OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o snd_modplug.o +OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o $(OBJ_SND_XMP) # No sound OBJ_SND_NULL=snd_null.o LIB_SND_NULL= -# Open Sound System (Linux, FreeBSD and Solaris) -OBJ_SND_OSS=$(OBJ_SND_COMMON) snd_oss.o -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_MODPLUG) - -# Core Audio (Mac OS X) -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_MODPLUG) - -# DirectX and Win32 WAVE output (Win32) -OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o -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_CD_COMMON=cd_shared.o -OBJ_NOCD=cd_null.o - - ###### Common objects and flags ##### # Common objects OBJ_COMMON= \ bih.o \ - cap_avi.o \ - cap_ogg.o \ crypto.o \ + cd_shared.o \ + cl_cmd.o \ cl_collision.o \ cl_demo.o \ - cl_dyntexture.o \ + cl_ents.o \ + cl_ents4.o \ + cl_ents5.o \ + cl_ents_nq.o \ + cl_ents_qw.o \ cl_input.o \ cl_main.o \ cl_parse.o \ cl_particles.o \ cl_screen.o \ cl_video.o \ + cl_video_libavw.o \ clvm_cmds.o \ cmd.o \ collision.o \ + com_crc16.o \ + com_ents.o \ + com_ents4.o \ + com_game.o \ + com_infostring.o \ + com_msg.o \ common.o \ console.o \ csprogs.o \ curves.o \ cvar.o \ - dpsoftrast.o \ dpvsimpledecode.o \ filematch.o \ fractalnoise.o \ @@ -114,7 +63,6 @@ OBJ_COMMON= \ gl_textures.o \ hmac.o \ host.o \ - host_cmd.o \ image.o \ image_png.o \ jpeg.o \ @@ -124,7 +72,6 @@ OBJ_COMMON= \ mathlib.o \ matrixlib.o \ mdfour.o \ - menu.o \ meshqueue.o \ mod_skeletal_animatevertices_sse.o \ mod_skeletal_animatevertices_generic.o \ @@ -132,9 +79,9 @@ OBJ_COMMON= \ model_brush.o \ model_shared.o \ model_sprite.o \ - mvm_cmds.o \ netconn.o \ palette.o \ + phys.o \ polygon.o \ portals.o \ protocol.o \ @@ -142,80 +89,127 @@ OBJ_COMMON= \ prvm_edict.o \ prvm_exec.o \ r_explosion.o \ - r_lerpanim.o \ r_lightning.o \ r_modules.o \ r_shadow.o \ r_sky.o \ r_sprites.o \ + r_stats.o \ sbar.o \ + sv_ccmds.o \ sv_demo.o \ + sv_ents.o \ + sv_ents4.o \ + sv_ents5.o \ + sv_ents_csqc.o \ + sv_ents_nq.o \ sv_main.o \ sv_move.o \ sv_phys.o \ + sv_save.o \ + sv_send.o \ sv_user.o \ svbsp.o \ svvm_cmds.o \ sys_shared.o \ + taskqueue.o \ vid_shared.o \ view.o \ wad.o \ world.o \ zone.o +OBJ_MENU= \ + menu.o \ + mvm_cmds.o + # note that builddate.c is very intentionally not compiled to a .o before # being linked, because it should be recompiled every time an executable is # built to give the executable a proper date string -OBJ_SV= builddate.c sys_linux.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON) -OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_SND_COMMON) snd_sdl.o $(OBJ_SDLCD) $(OBJ_COMMON) +OBJ_SV= builddate.c sys_null.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON) +OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) $(OBJ_SND_XMP) snd_sdl.o $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) # Compilation -CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../ -CFLAGS_CLIENT=-DCONFIG_CD +# -D_POSIX_C_SOURCE=200809L doesn't enable all of POSIX 2008, wtf? +# -D_DEFAULT_SOURCE does enables all of POSIX 2008 (without GNU extensions). +ifeq ($(PEDANTIC),1) + CFLAGS_STANDARD=-std=c17 -pedantic -D_DEFAULT_SOURCE -DCONFIG_PEDANTIC +else + CFLAGS_STANDARD= +endif + +CFLAGS_WARNINGS=-Wall -Werror=vla -Wc++-compat -Wwrite-strings -Wshadow -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes + +CFLAGS_TCC= +ifeq ($(CC), tcc) + CFLAGS_TCC=-DSDL_DISABLE_IMMINTRIN_H +else + CFLAGS_MAKEDEP?=-MMD +endif + +CFLAGS_COMMON=$(CFLAGS_STANDARD) $(CFLAGS_TCC) $(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_SND_XMP) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../ +CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE) CFLAGS_SERVER= CFLAGS_DEBUG=-ggdb CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs CFLAGS_RELEASE= CFLAGS_RELEASE_PROFILE=-fbranch-probabilities -CFLAGS_SDL=$(SDLCONFIG_CFLAGS) - -CFLAGS_SSE=-msse -CFLAGS_SSE2=-msse2 - -OPTIM_DEBUG=$(CPUOPTIMIZATIONS) +CFLAGS_SDL= + +ifeq ($(DP_SSE),1) + CFLAGS_SSE=-msse + CFLAGS_SSE2=-msse2 +else + CFLAGS_SSE= + CFLAGS_SSE2= +endif # ifeq ($(DP_SSE),1) + +# No specific CPU +CPUOPTIMIZATIONS?= +# x86 +ifeq ($(DP_SSE),1) + CPUOPTIMIZATIONS+=-mno-avx +endif +# bones_was_here: added -mno-avx because when compiling for (at least) haswell or skylake with gcc or clang, with both -O2 and -O3, AVX auto-vectorisation causes subtle bugs in Xonotic QC physics, and changes the hash generated by the CI pipeline. AVX2 seems to be OK. + +# We can get good stack traces at -O1 with -fno-omit-frame-pointer (as recommended by ASan docs) for a hefty boost compared to unoptimised. +OPTIM_DEBUG=-O1 -fno-omit-frame-pointer $(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS) -#OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS) +#OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) -OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS) +#OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS) +#OPTIM_RELEASE=-O3 -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS) +# -Winline is here instead of in CFLAGS_WARNINGS because we need inlining disabled for good stack traces in debug builds, +# also because UBSan and ASan cause this warning to be spammed. +OPTIM_RELEASE=-O3 -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS) -Winline # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag +# Also, since gcc 5, -ffinite-math-only makes NaN and zero compare equal inside engine code but not inside QC, which causes error spam for seemingly valid QC code like if (x != 0) return 1 / x; DO_CC=$(CC) $(CFLAGS) -c $< -o $@ # Link -LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=debug -LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=profile -LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release +# not checking for .git directory before running `git describe` because that would stop it working in a subdirectory +VCREVISION=$(shell { test -d .svn && svnversion; } || git describe --always --dirty='~' 2>/dev/null || echo -) -##### UNIX specific variables ##### +LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DVCREVISION=$(VCREVISION) -DBUILDTYPE=debug +LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DVCREVISION=$(VCREVISION) -DBUILDTYPE=profile +LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DVCREVISION=$(VCREVISION) -DBUILDTYPE=release -OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) -LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) -LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug +##### UNIX specific variables ##### + +LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_SND_XMP) LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl -LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug +LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lxmp CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD -LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) $(LIB_SND_MODPLUG) -EXE_UNIXCL=darkplaces-glx +LDFLAGS_UNIXSDL=$(SDL_LIBS) #-lGLESv2 EXE_UNIXSV=darkplaces-dedicated EXE_UNIXSDL=darkplaces-sdl -EXE_UNIXCLNEXUIZ=nexuiz-glx EXE_UNIXSVNEXUIZ=nexuiz-dedicated EXE_UNIXSDLNEXUIZ=nexuiz-sdl @@ -227,36 +221,24 @@ CMD_UNIXMKDIR=mkdir -p ##### Linux specific variables ##### # Link -LDFLAGS_LINUXCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXCL) -LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL) +# -rdynamic allows glibc backtrace_symbols_fd() to convert addresses to function names +# with a much smaller binary than with full debug symbols +LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -rdynamic +LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -rdynamic $(LDFLAGS_UNIXSDL) ##### Mac OS X specific variables ##### -# No CD support available -OBJ_MACOSXCD=$(OBJ_NOCD) - # Link -LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $(LIB_SOUND) LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl -LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) SDLMain.m - -OBJ_AGL= builddate.c sys_linux.o vid_agl.o thread_null.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) - -EXE_MACOSXCL=darkplaces-agl -EXE_MACOSXCLNEXUIZ=nexuiz-agl +LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) #../../../SDLMain.m ##### SunOS specific variables ##### -# No CD support available -OBJ_SUNOSCD=$(OBJ_NOCD) - CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS # Link -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) @@ -264,7 +246,6 @@ LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSD ##### BSD specific variables ##### # Link -LDFLAGS_BSDCL=$(LDFLAGS_UNIXCOMMON) -lutil $(LDFLAGS_UNIXCL) LDFLAGS_BSDSV=$(LDFLAGS_UNIXCOMMON) LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) @@ -273,17 +254,12 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) WINDRES ?= windres -OBJ_WGL= builddate.c sys_win.o vid_wgl.o thread_null.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) - # Link # see LDFLAGS_WINCOMMON in makefile -LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mwindows -lwinmm -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -lws2_32 $(LDFLAGS_D3D) $(LIB_Z) $(LIB_JPEG) LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mconsole -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) -LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(SDLCONFIG_LIBS) $(LIB_SND_MODPLUG) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) -EXE_WINCL=darkplaces.exe +LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LDFLAGS_UNIXSDL) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) $(LIB_SND_XMP) EXE_WINSV=darkplaces-dedicated.exe EXE_WINSDL=darkplaces-sdl.exe -EXE_WINCLNEXUIZ=nexuiz.exe EXE_WINSVNEXUIZ=nexuiz-dedicated.exe EXE_WINSDLNEXUIZ=nexuiz-sdl.exe @@ -293,43 +269,37 @@ VPATH := ../../../ .PHONY : clean clean-profile help \ debug profile release \ - cl-debug cl-profile cl-release \ sv-debug sv-profile sv-release \ sdl-debug sdl-profile sdl-release help: @echo @echo "===== Choose one =====" - @echo "* $(MAKE) clean : delete all files produced by the build except" - @echo " profiling information" - @echo "* $(MAKE) clean-profile : delete all files produced by the build, including" - @echo " profiling informaiton" - @echo "* $(MAKE) help : this help" - @echo "* $(MAKE) debug : make client and server binaries (debug versions)" - @echo "* $(MAKE) profile : make client and server binaries (profile versions)" - @echo "* $(MAKE) release : make client and server binaries (release versions)" - @echo "* $(MAKE) release-profile : make client and server binaries (release versions)" - @echo " with profileing optomizations) The profiled" - @echo " version of the program must have been" - @echo " previously compiled" - @echo "* $(MAKE) nexuiz : make client and server binaries with nexuiz icon" - @echo " (release versions)" - @echo "* $(MAKE) cl-debug : make client (debug version)" - @echo "* $(MAKE) cl-profile : make client (profile version)" - @echo "* $(MAKE) cl-release : make client (release version)" - @echo "* $(MAKE) cl-release-profile : make client (release version)" - @echo "* $(MAKE) cl-nexuiz : make client with nexuiz icon (release version)" - @echo "* $(MAKE) sv-debug : make dedicated server (debug version)" - @echo "* $(MAKE) sv-profile : make dedicated server (profile version)" - @echo "* $(MAKE) sv-release : make dedicated server (release version)" - @echo "* $(MAKE) sv-release-profile : make dedicated server (release version)" - @echo "* $(MAKE) sv-nexuiz : make dedicated server with nexuiz icon" - @echo " (release version)" - @echo "* $(MAKE) sdl-debug : make SDL client (debug version)" - @echo "* $(MAKE) sdl-profile : make SDL client (profile version)" - @echo "* $(MAKE) sdl-profile-profile : make SDL client (profile version)" - @echo "* $(MAKE) sdl-release : make SDL client (release version)" - @echo "* $(MAKE) sdl-nexuiz : make SDL client with nexuiz icon (release version)" + @echo "* $(MAKE) clean : delete all files produced by the build except" + @echo " profiling information" + @echo "* $(MAKE) clean-profile : delete all files produced by the build, including" + @echo " profiling informaiton" + @echo "* $(MAKE) help : this help" + @echo "* $(MAKE) debug : make client and server binaries (debug versions)" + @echo "* $(MAKE) profile : make client and server binaries (profile versions)" + @echo "* $(MAKE) release : make client and server binaries (release versions)" + @echo "* $(MAKE) release-profile : make client and server binaries (release versions)" + @echo " (with profiling optimizations) The profiled" + @echo " version of the program must have been" + @echo " previously compiled" + @echo "* $(MAKE) nexuiz : make client and server binaries with nexuiz icon" + @echo " (release versions)" + @echo "* $(MAKE) sv-debug : make dedicated server (debug version)" + @echo "* $(MAKE) sv-profile : make dedicated server (profile version)" + @echo "* $(MAKE) sv-release-profile : make dedicated server (release profile version)" + @echo "* $(MAKE) sv-release : make dedicated server (release version)" + @echo "* $(MAKE) sv-nexuiz : make dedicated server with nexuiz icon" + @echo " (release version)" + @echo "* $(MAKE) sdl-debug : make SDL client (debug version)" + @echo "* $(MAKE) sdl-profile : make SDL client (profile version)" + @echo "* $(MAKE) sdl-release-profile : make SDL client (release version)" + @echo "* $(MAKE) sdl-release : make SDL client (release version)" + @echo "* $(MAKE) sdl-nexuiz : make SDL client with nexuiz icon (release version)" @echo debug : @@ -347,171 +317,128 @@ release-profile : nexuiz : $(MAKE) $(TARGETS_NEXUIZ) -cl-debug : - $(MAKE) bin-debug \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_CL)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1 - -cl-release-profile : - $(MAKE) bin-release-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_CL)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) 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)" CFLAGS_FEATURES=$(CFLAGS_SERVER) LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' 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)" CFLAGS_FEATURES=$(CFLAGS_SERVER) LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' 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)" CFLAGS_FEATURES=$(CFLAGS_SERVER) LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1 sv-release-profile : $(MAKE) bin-release-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SV)" CFLAGS_FEATURES=$(CFLAGS_SERVER) LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_SV)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SVNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 sdl-release-profile : $(MAKE) bin-release-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE="$(EXE_SDL)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' 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)" CFLAGS_FEATURES=$(CFLAGS_CLIENT) LDFLAGS_COMMON="$(LDFLAGS_SDL)" LEVEL=1 + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 bin-debug : $(CHECKLEVEL1) @echo - @echo "========== $(EXE) (debug) ==========" - $(MAKE) prepare BUILD_DIR=obj/debug/$(EXE) - $(MAKE) -C obj/debug/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ - LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" LEVEL=2 + @echo '========== $(EXE) (debug) ==========' + $(MAKE) prepare BUILD_DIR=build-obj/debug/$(EXE) + $(MAKE) -C build-obj/debug/$(EXE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)'\ + LDFLAGS='$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)' LEVEL=2 bin-profile : $(CHECKLEVEL1) @echo - @echo "========== $(EXE) (profile) ==========" - $(MAKE) prepare BUILD_DIR=obj/profile/$(EXE) - $(MAKE) -C obj/profile/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" LEVEL=2 + @echo '========== $(EXE) (profile) ==========' + $(MAKE) prepare BUILD_DIR=build-obj/profile/$(EXE) + $(MAKE) -C build-obj/profile/$(EXE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)'\ + LDFLAGS='$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)' LEVEL=2 bin-release : $(CHECKLEVEL1) @echo - @echo "========== $(EXE) (release) ==========" - $(MAKE) prepare BUILD_DIR=obj/release/$(EXE) - $(MAKE) -C obj/release/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2 + @echo '========== $(EXE) (release) ==========' + $(MAKE) prepare BUILD_DIR=build-obj/release/$(EXE) + $(MAKE) -C build-obj/release/$(EXE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)'\ + LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2 $(STRIP) $(EXE) bin-release-profile : $(CHECKLEVEL1) @echo - @echo "========== $(EXE) (release) ==========" - $(MAKE) prepare BUILD_DIR=obj/release-profile/$(EXE) - $(MAKE) -C obj/release-profile/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE_PROFILE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2 + @echo '========== $(EXE) (release) ==========' + $(MAKE) prepare BUILD_DIR=build-obj/release-profile/$(EXE) + $(MAKE) -C build-obj/release-profile/$(EXE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE_PROFILE) $(OPTIM_RELEASE)'\ + LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2 $(STRIP) $(EXE) prepare : $(CMD_MKDIR) $(BUILD_DIR) $(CMD_CP) makefile.inc $(BUILD_DIR)/ + $(CMD_CP) $(MAKEFILE) $(BUILD_DIR)/ -snd_modplug.o: snd_modplug.c - $(CHECKLEVEL2) - $(DO_CC) $(CFLAGS_SND_MODPLUG) #this checks USEODE when compiling so it needs the ODE flags as well -prvm_cmds.o: prvm_cmds.c +cl_parse.o: cl_parse.c $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_ODE) -world.o: world.c +cs_progs.o: cs_progs.c $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_ODE) -vid_glx.o: vid_glx.c - $(CHECKLEVEL2) - $(DO_CC) -I/usr/X11R6/include - -keysym2ucs.o: keysym2ucs.c - $(CHECKLEVEL2) - $(DO_CC) -I/usr/X11R6/include - -vid_sdl.o: vid_sdl.c +sv_main.o: sv_main.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) + $(DO_CC) $(CFLAGS_ODE) -thread_sdl.o: thread_sdl.c +sv_phys.o: sv_phys.c $(CHECKLEVEL2) - $(DO_CC) $(CFLAGS_SDL) + $(DO_CC) $(CFLAGS_ODE) -snd_3dras.o: snd_3dras.c +prvm_cmds.o: prvm_cmds.c $(CHECKLEVEL2) - $(DO_CC) + $(DO_CC) $(CFLAGS_ODE) -cd_sdl.o: cd_sdl.c +world.o: world.c $(CHECKLEVEL2) - $(DO_CC) $(CFLAGS_SDL) + $(DO_CC) $(CFLAGS_ODE) crypto.o: crypto.c $(CHECKLEVEL2) @@ -521,9 +448,19 @@ mod_skeletal_animatevertices_sse.o: mod_skeletal_animatevertices_sse.c $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_SSE) -dpsoftrast.o: dpsoftrast.c +snd_xmp.o: snd_xmp.c + $(CHECKLEVEL2) + $(DO_CC) $(CFLAGS_SND_XMP) + +#this checks USEXMP when compiling so it needs the XMP flags as well +snd_main.o: snd_main.c + $(CHECKLEVEL2) + $(DO_CC) $(CFLAGS_SND_XMP) + +#this checks USEXMP when compiling so it needs the XMP flags as well +snd_mem.o: snd_mem.c $(CHECKLEVEL2) - $(DO_CC) $(CFLAGS_SSE2) + $(DO_CC) $(CFLAGS_SND_XMP) darkplaces.o: %.o : %.rc $(CHECKLEVEL2) @@ -536,10 +473,7 @@ nexuiz.o: %.o : %.rc .c.o: $(CHECKLEVEL2) $(DO_CC) - -$(EXE_CL): $(OBJ_CL) $(OBJ_ICON) - $(CHECKLEVEL2) - $(DO_LD) +.c.o: .EXTRA_PREREQS = # According to POSIX, a suffix rule cannot contain prerequisites. $(EXE_SV): $(OBJ_SV) $(OBJ_ICON) $(CHECKLEVEL2) @@ -549,10 +483,6 @@ $(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) @@ -561,16 +491,19 @@ $(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ) $(CHECKLEVEL2) $(DO_LD) +# If requested, these targets must always run first: +.EXTRA_PREREQS := $(filter clean clean-profile, $(MAKECMDGOALS)) + clean: - -$(CMD_RM) $(EXE_CL) -$(CMD_RM) $(EXE_SV) -$(CMD_RM) $(EXE_SDL) - -$(CMD_RM) $(EXE_CLNEXUIZ) -$(CMD_RM) $(EXE_SVNEXUIZ) -$(CMD_RM) $(EXE_SDLNEXUIZ) -$(CMD_RM) *.o -$(CMD_RM) *.d - -$(CMD_RM) obj/ + -$(CMD_RM) *.gch + -$(CMD_RM) build-obj/ +clean: .EXTRA_PREREQS = # prevents circular dependency with clean-profile clean-profile: clean -$(CMD_RM) *.gcda