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

diff --git a/all b/all
index 6bbac8fe..6684d2bd 100755
--- a/all
+++ b/all
@@ -113,6 +113,7 @@ data/xonotic-data.pk3dir      |
 data/xonotic-maps.pk3dir      |                                                   | master
 data/xonotic-music.pk3dir     |                                                   | master
 data/xonotic-nexcompat.pk3dir |                                                   | master
+mediasource                   |                                                   | master
 darkplaces                    |                                                   | div0-stable
 fteqcc                        | git://github.com/Blub/qclib.git                   | master
 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master
@@ -129,7 +130,14 @@ repourl()
 {
 	t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
 	if [ -n "$t" ]; then
-		echo "$t"
+		case "$t" in
+			*://*)
+				echo "$t"
+				;;
+			*)
+				echo "$base$t"
+				;;
+		esac
 	else
 		if [ x"$1" = x"." ]; then
 			echo "$base""xonotic.git"
@@ -440,6 +448,9 @@ case "$cmd" in
 					MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
 					;;
 			esac
+			if [ -n "$WE_HATE_OUR_USERS" ]; then
+				MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
+			fi
 		fi
 		enter "$d0/fteqcc" verbose
 		if $clean; then
@@ -463,6 +474,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 +573,9 @@ case "$cmd" in
 		rm -rf "$patchdir"
 		;;
 	admin-merge)
+		if [ "$#" = 1 ]; then
+			set -- "${1%%/*}" "${1#*/}"
+		fi
 		for d in $repos; do
 			enter "$d0/$d" verbose
 			git rev-parse "$1/$2" || continue