X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=e9134bf779b19e058e4adfda906b18ad90d67fdf;hp=6bbac8fe7df098081e5af0f300833436d44a9972;hb=ff786842ab496a0bfb63fb87a806b2c9fc395e34;hpb=7bb12633412c3c067957b637b2127114e28a22cd

diff --git a/all b/all
index 6bbac8fe..e9134bf7 100755
--- a/all
+++ b/all
@@ -463,6 +463,9 @@ case "$cmd" in
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
 			export PATH="$d0/misc/buildfiles/w32:$PATH"
+		elif [ x"`uname`" = x"Darwin" ]; then
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+			client=-sdl
 		else
 			client=-sdl
 		fi
@@ -559,6 +562,9 @@ case "$cmd" in
 		rm -rf "$patchdir"
 		;;
 	admin-merge)
+		if [ "$#" = 2 ]; then
+			set -- "${1%%/*}" "${1#*/}"
+		fi
 		for d in $repos; do
 			enter "$d0/$d" verbose
 			git rev-parse "$1/$2" || continue