From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 17 Jun 2010 21:25:06 +0000 (+0200)
Subject: Revert "support user install of SDL framework"
X-Git-Tag: xonotic-v0.1.0preview~420
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6dcc927d5bbaaddbba2b337ec473661d7f6382a4;p=xonotic%2Fdarkplaces.git

Revert "support user install of SDL framework"

This reverts commit afe7e6c2d7e0e24c93bc21de7a8031b8f7ec31d0.

(Nothing personal, but this has to go into svn trunk, not into this branch... my bad)
---

diff --git a/makefile.inc b/makefile.inc
index aeac6e31..b6e1ffbc 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 -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/SDL.framework/Headers
+SDLCONFIG_MACOSXLIBS=-framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
+SDLCONFIG_MACOSXSTATICLIBS=-framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
 STRIP?=strip