X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=32797e0cfb18c379d1f6aac86943307f8f218d5a;hp=a0afbf23e0b07b1969574fed064d40e1190ee109;hb=5a126af930cb0f3c66b3065218d939d4bbacb613;hpb=a061e592f5be6deb9bd609a060f006836ce07b72 diff --git a/makefile.inc b/makefile.inc index a0afbf23..32797e0c 100644 --- a/makefile.inc +++ b/makefile.inc @@ -25,17 +25,16 @@ CC?=gcc 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 -SDL2_CONFIG?=sdl2-config +SDL_CONFIG?=sdl2-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) +SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL2.framework/Headers -I$(HOME)/Library/Frameworks/SDL2.framework/Headers +SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) +SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) STRIP?=strip @@ -84,7 +83,6 @@ OBJ_COMMON= \ crypto.o \ cl_collision.o \ cl_demo.o \ - cl_dyntexture.o \ cl_input.o \ cl_main.o \ cl_parse.o \ @@ -99,7 +97,6 @@ OBJ_COMMON= \ csprogs.o \ curves.o \ cvar.o \ - dpsoftrast.o \ dpvsimpledecode.o \ filematch.o \ fractalnoise.o \ @@ -172,17 +169,22 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM # Compilation -CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) $(CFLAGS_NET) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../ +CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../ CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(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_SDL= -CFLAGS_SSE=-msse -CFLAGS_SSE2=-msse2 +ifeq ($(DP_SSE),1) + CFLAGS_SSE=-msse + CFLAGS_SSE2=-msse2 +else + CFLAGS_SSE= + CFLAGS_SSE2= +endif # ifeq ($(DP_SSE),1) OPTIM_DEBUG=$(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS) @@ -331,11 +333,6 @@ help: @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 "* $(MAKE) sdl2-debug : make SDL2 client (debug version)" - @echo "* $(MAKE) sdl2-profile : make SDL2 client (profile version)" - @echo "* $(MAKE) sdl2-release-profile : make SDL2 client (release profile version)" - @echo "* $(MAKE) sdl2-release : make SDL2 client (release version)" - @echo "* $(MAKE) sdl2-nexuiz : make SDL2 client with nexuiz icon (release version)" @echo debug : @@ -401,47 +398,32 @@ sv-release-profile : 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 + 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 + 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 + 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 + 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 + 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 - -sdl2-debug : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-debug - -sdl2-profile : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-profile - -sdl2-release : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-release - -sdl2-release-profile : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-release-profile - -sdl2-nexuiz : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-nexuiz + EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 bin-debug : $(CHECKLEVEL1) @@ -507,30 +489,6 @@ keysym2ucs.o: keysym2ucs.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) - -thread_sdl.o: thread_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) - crypto.o: crypto.c $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_CRYPTO) $(CFLAGS_CRYPTO_RIJNDAEL) @@ -539,10 +497,6 @@ mod_skeletal_animatevertices_sse.o: mod_skeletal_animatevertices_sse.c $(CHECKLEVEL2) $(DO_CC) $(CFLAGS_SSE) -dpsoftrast.o: dpsoftrast.c - $(CHECKLEVEL2) - $(DO_CC) $(CFLAGS_SSE2) - darkplaces.o: %.o : %.rc $(CHECKLEVEL2) $(WINDRES) -o $@ $<