From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 9 Jul 2010 21:08:38 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
X-Git-Tag: xonotic-v0.1.0preview~374
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f217d0db491385cbf8e5e0ee2446d8222f0d5883;hp=-c

Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
---

f217d0db491385cbf8e5e0ee2446d8222f0d5883
diff --combined all
index a8354da8,2489f5aa..bb0fa483
--- a/all
+++ b/all
@@@ -398,7 -398,7 +398,7 @@@ case "$cmd" i
  			fi
  			rem=`git config "branch.$r.remote" || echo origin`
  			bra=`git config "branch.$r.merge" || echo "$r"`
 -			upstream="$rem/$bra"
 +			upstream="$rem/${bra#refs/heads/}"
  			if ! git rev-parse "$upstream" >/dev/null 2>&1; then
  				upstream="origin/`repobranch "$d"`"
  			fi
@@@ -424,9 -424,17 +424,17 @@@
  			if [ -z "$CC" ]; then
  				export CC=gcc
  			fi
- 		elif [ x"`uname`" = x"Darwin" ] && { [ -d /Library/Frameworks/SDL.framework ] || [ -d "$HOME/Library/Frameworks/SDL.framework" ]; }; then
- 			# AGL is broken in Snow Leopard, so let's default to SDL if it is available.
- 			TARGETS="sv-debug sdl-debug"
+ 		elif [ x"`uname`" = x"Darwin" ]; then
+ 			case "`uname -r`" in
+ 				?.*)
+ 					TARGETS="sv-debug cl-debug sdl-debug"
+ 					;;
+ 				*)
+ 					# AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
+ 					TARGETS="sv-debug sdl-debug"
+ 					;;
+ 			esac
+ 			export CC="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
  		else
  			TARGETS="sv-debug cl-debug sdl-debug"
  		fi
@@@ -511,6 -519,7 +519,7 @@@
  			export PATH="$d0/misc/buildfiles/w32:$PATH"
  		elif [ x"`uname`" = x"Darwin" ]; then
  			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
+ 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
  			client=-sdl
  		else
  			client=-sdl