From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 17 Jul 2010 15:05:09 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~89
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=14253bf22931c267c5f4399730894b0e015c4df5

Merge remote branch 'origin/master' into divVerent/crypto2

Conflicts:
	all
---

14253bf22931c267c5f4399730894b0e015c4df5
diff --cc all
index e62d477a,933a51b6..d85c0970
--- a/all
+++ b/all
@@@ -523,12 -516,12 +530,13 @@@ case "$cmd" i
  	run)
  		if [ -n "$WE_HATE_OUR_USERS" ]; then
  			client=
 -			export PATH="$d0/misc/buildfiles/w32:$PATH"
 +			export PATH="$d0/misc/buildfiles/w32:$d0/d0_blind_id/.libs/$PATH"
  		elif [ x"`uname`" = x"Darwin" ]; then
 -			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 +			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
+ 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
  			client=-sdl
  		else
 +			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
  			client=-sdl
  		fi
  		case "$1" in