X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=ae1cc029ab35897b3c7bea537ac81c5a0fa8d31d;hb=4ddfbf9f36794c9436eb6aa277622dc2732c35f2;hp=07d73b308d34eb0991f66dcbca2a29d04c7b23ea;hpb=31bc6f42205f75d58be52a0059c95cdbe90679af;p=xonotic%2Fdarkplaces.git diff --git a/makefile.inc b/makefile.inc index 07d73b30..ae1cc029 100644 --- a/makefile.inc +++ b/makefile.inc @@ -16,6 +16,15 @@ CC=gcc # No specific CPU (386 compatible) CPUOPTIMIZATIONS= +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 +STRIP?=strip + ###### Sound and audio CD ##### @@ -35,7 +44,7 @@ LIB_SND_ALSA=-lasound # Core Audio (Mac OS X) OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c -LIB_SND_COREAUDIO= +LIB_SND_COREAUDIO=-framework CoreAudio # BSD / Sun audio API (NetBSD and OpenBSD) OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o @@ -55,8 +64,6 @@ OBJ_NOCD=cd_null.o # Common objects OBJ_COMMON= \ cd_shared.o \ - cgame.o \ - cgamevm.o \ cl_collision.o \ cl_demo.o \ cl_input.o \ @@ -65,10 +72,12 @@ OBJ_COMMON= \ cl_particles.o \ cl_screen.o \ cl_video.o \ + clvm_cmds.o \ cmd.o \ collision.o \ common.o \ console.o \ + csprogs.o \ curves.o \ cvar.o \ dpvsimpledecode.o \ @@ -83,11 +92,14 @@ OBJ_COMMON= \ host.o \ host_cmd.o \ image.o \ + image_png.o \ jpeg.o \ keys.o \ lhnet.o \ + libcurl.o \ mathlib.o \ matrixlib.o \ + mdfour.o \ menu.o \ meshqueue.o \ model_alias.o \ @@ -103,7 +115,6 @@ OBJ_COMMON= \ prvm_cmds.o \ prvm_edict.o \ prvm_exec.o \ - r_crosshairs.o \ r_explosion.o \ r_lerpanim.o \ r_light.o \ @@ -113,13 +124,14 @@ OBJ_COMMON= \ r_sky.o \ r_sprites.o \ sbar.o \ + sv_demo.o \ sv_main.o \ sv_move.o \ sv_phys.o \ sv_user.o \ + svbsp.o \ svvm_cmds.o \ sys_shared.o \ - ui.o \ vid_shared.o \ view.o \ wad.o \ @@ -134,14 +146,17 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $( # Compilation -# CFLAGS_COMMON=-MD -Wall -Werror -CFLAGS_COMMON=-MD -Wall -Wsign-compare +CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) -Wall -Wsign-compare -Wdeclaration-after-statement CFLAGS_DEBUG=-ggdb CFLAGS_PROFILE=-g -pg -ggdb CFLAGS_RELEASE= +CFLAGS_SDL=$(SDLCONFIG_CFLAGS) OPTIM_DEBUG=$(CPUOPTIMIZATIONS) -OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(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 -funroll-loops $(CPUOPTIMIZATIONS) +OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) DO_CC=$(CC) $(CFLAGS) -c $< -o $@ @@ -157,17 +172,19 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) LDFLAGS_UNIXCOMMON=-lm -#LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) -ifeq ($(DP_MAKE_TARGET), sunos) - LDFLAGS_UNIXCL=-R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND) -else - LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) -endif - -LDFLAGS_UNIXSDL=`sdl-config --libs` +LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) +LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl +LDFLAGS_UNIXSV_PRELOAD=-lz -lcurl +LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl +CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD + +LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) EXE_UNIXCL=darkplaces-glx EXE_UNIXSV=darkplaces-dedicated EXE_UNIXSDL=darkplaces-sdl +EXE_UNIXCLNEXUIZ=nexuiz-glx +EXE_UNIXSVNEXUIZ=nexuiz-dedicated +EXE_UNIXSDLNEXUIZ=nexuiz-sdl CMD_UNIXRM=rm -rf @@ -187,18 +204,20 @@ LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL) ##### Mac OS X specific variables ##### -# If you want CD sound in Mac OS X -#OBJ_MACOSXCD=cd_macosx.o -# If you want no CD audio +# No CD support available OBJ_MACOSXCD=$(OBJ_NOCD) # Link -LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL) +LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $(LIB_SOUND) LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl -LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs` +LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(SDLCONFIG_STATICLIBS) SDLMain.m OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) +EXE_MACOSXCL=darkplaces-agl +EXE_MACOSXCLNEXUIZ=nexuiz-agl + + ##### SunOS specific variables ##### # No CD support available @@ -207,7 +226,7 @@ OBJ_SUNOSCD=$(OBJ_NOCD) CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS # Link -LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXCL) +LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND) LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) @@ -227,21 +246,26 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) ##### Win32 specific variables ##### +WINDRES ?= windres #if you want CD sound in Win32 OBJ_WINCD=cd_win.o #if you want no CD audio #OBJ_WINCD=$(OBJ_NOCD) -OBJ_WGL= builddate.c darkplaces.o 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 conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) # Link -LDFLAGS_WINCOMMON=-lwinmm -lwsock32 -LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole -LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs` +# 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) EXE_WINCL=darkplaces.exe EXE_WINSV=darkplaces-dedicated.exe EXE_WINSDL=darkplaces-sdl.exe +EXE_WINCLNEXUIZ=nexuiz.exe +EXE_WINSVNEXUIZ=nexuiz-dedicated.exe +EXE_WINSDLNEXUIZ=nexuiz-sdl.exe ##### Commands ##### @@ -260,15 +284,19 @@ 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) nexuiz : make client and server binaries with nexuiz icon (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-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-nexuiz : make dedicated server with nexuiz icon (release version)" @echo "* $(MAKE) sdl-debug : make SDL client (debug version)" @echo "* $(MAKE) sdl-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 debug : @@ -280,6 +308,9 @@ profile : release : $(MAKE) sv-release cl-release sdl-release +nexuiz : + $(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz + cl-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ @@ -295,6 +326,11 @@ cl-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" +cl-nexuiz : + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)" + sv-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ @@ -310,6 +346,11 @@ sv-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" +sv-nexuiz : + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)" + sdl-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ @@ -325,6 +366,11 @@ sdl-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" +sdl-nexuiz : + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" + bin-debug : @echo @echo "========== $(EXE) (debug) ==========" @@ -348,41 +394,56 @@ bin-release : 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)" - strip $(EXE) + $(STRIP) $(EXE) vid_glx.o: vid_glx.c $(DO_CC) -I/usr/X11R6/include vid_sdl.o: vid_sdl.c - $(DO_CC) `sdl-config --cflags` + $(DO_CC) $(CFLAGS_SDL) sys_sdl.o: sys_sdl.c - $(DO_CC) `sdl-config --cflags` + $(DO_CC) $(CFLAGS_SDL) snd_sdl.o: snd_sdl.c - $(DO_CC) `sdl-config --cflags` + $(DO_CC) $(CFLAGS_SDL) cd_sdl.o: cd_sdl.c - $(DO_CC) `sdl-config --cflags` + $(DO_CC) $(CFLAGS_SDL) darkplaces.o: %.o : %.rc - windres -o $@ $< + $(WINDRES) -o $@ $< + +nexuiz.o: %.o : %.rc + $(WINDRES) -o $@ $< .c.o: $(DO_CC) -$(EXE_CL): $(OBJ_CL) +$(EXE_CL): $(OBJ_CL) $(OBJ_ICON) + $(DO_LD) + +$(EXE_SV): $(OBJ_SV) $(OBJ_ICON) + $(DO_LD) + +$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON) + $(DO_LD) + +$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ) $(DO_LD) -$(EXE_SV): $(OBJ_SV) +$(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ) $(DO_LD) -$(EXE_SDL): $(OBJ_SDL) +$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ) $(DO_LD) 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