X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=9c66ed1d946a742459de614624d7acd1d4c5cc74;hb=1da342cb637815a1eb2d9d96384ceb6fa4765d3f;hp=32417d176689185009f5a1424e1ff58315966b67;hpb=30e96fbc2e0b7987227ae65fe881b342fcbbcdec;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index 32417d17..9c66ed1d 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -171,32 +171,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=
 
-ifeq ($(DP_MACHINE),x86_64)
-	CFLAGS_SSE=-msse
-	CFLAGS_SSE2=-msse2
-else
-ifeq ($(DP_MACHINE),i686)
-	CFLAGS_SSE=-msse
-	CFLAGS_SSE2=-msse2
-else
-ifeq ($(DP_MACHINE),i386)
+ifeq ($(DP_SSE),1)
 	CFLAGS_SSE=-msse
 	CFLAGS_SSE2=-msse2
 else
 	CFLAGS_SSE=
 	CFLAGS_SSE2=
-endif # ifeq ($(DP_MACHINE),i386)
-endif # ifeq ($(DP_MACHINE),i686)
-endif # ifeq ($(DP_MACHINE),x86_64)
+endif # ifeq ($(DP_SSE),1)
 
 OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
@@ -415,27 +405,27 @@ sv-nexuiz :
 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
+		EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1
 
 bin-debug :
 	$(CHECKLEVEL1)
@@ -501,30 +491,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)