added a -I option on Mac OSX SDL builds to include the relevant Headers

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 608677fe725a0ea81090ff6770b117d94a6b5400..93fccf49f1bb7244f70d04ab14975113491cae23 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -20,9 +20,9 @@ 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
 
 
@@ -152,12 +152,6 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(
 
 # Compilation
 CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) -Wall -Wsign-compare -Wdeclaration-after-statement
-ifdef DP_ARCH
-CFLAGS_COMMON+=-DDP_ARCH=\\\"$(DP_ARCH)\\\"
-endif
-ifdef DP_MACHINE
-CFLAGS_COMMON+=-DDP_MACHINE=\\\"$(DP_MACHINE)\\\"
-endif
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=