From: divverent Date: Thu, 17 Jun 2010 21:39:12 +0000 (+0000) Subject: support user install of SDL framework X-Git-Tag: xonotic-v0.1.0preview~230^2~241 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38946a1538b4072a131382a48716a4463194390f;p=xonotic%2Fdarkplaces.git support user install of SDL framework From: Merlijn Hofstra git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10237 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/makefile.inc b/makefile.inc index b6e1ffbc..aeac6e31 100644 --- a/makefile.inc +++ b/makefile.inc @@ -38,9 +38,9 @@ SDL_CONFIG?=sdl-config SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags` SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs` SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs` -SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers -SDLCONFIG_MACOSXLIBS=-framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) -SDLCONFIG_MACOSXSTATICLIBS=-framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) +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