X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=15a98b79b908adf03a2fdb14155ec56ce402215d;hp=bffab80cc57b73330513d68d8c2af797a9e61e02;hb=c53177ca964eea2500cb954e322af5146cc2078c;hpb=474bca19f8ed45309e7c021316ac5cf53bf65f63

diff --git a/all b/all
index bffab80c..15a98b79 100755
--- a/all
+++ b/all
@@ -243,13 +243,17 @@ case "$cmd" in
 				dv=`visible_repo_name "$d"`
 				enter "$d0/$d" verbose
 				a=
-				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Branch in $dv?"
-					read -r a
-				done
-				if [ x"$a" = x"y" ]; then
-					verbose git push "$remote" "$srcbranch":"$branch"
-					verbose git checkout --track -b "$branch" "$remote/$branch"
+				if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+					echo "Already having this branch in $dv."
+				else
+					while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+						echo "Branch in $dv?"
+						read -r a
+					done
+					if [ x"$a" = x"y" ]; then
+						verbose git push "$remote" "$srcbranch":"$branch"
+						verbose git checkout --track -b "$branch" "$remote/$branch"
+					fi
 				fi
 				cd "$d0"
 			done
@@ -348,6 +352,25 @@ case "$cmd" in
 		done
 		;;
 	compile)
+		if [ -n "$WE_HATE_OUR_USERS" ]; then
+			TARGETS="sv-debug cl-debug"
+		else
+			TARGETS="sv-debug cl-debug sdl-debug"
+		fi
+		case "$1" in
+			sdl)
+				TARGETS="sdl-debug"
+				shift
+				;;
+			glx|agl|wgl)
+				TARGETS="cl-debug"
+				shift
+				;;
+			dedicated)
+				TARGETS="sv-debug"
+				shift
+				;;
+		esac
 		if [ -z "$MAKEFLAGS" ]; then
 			if [ -f /proc/cpuinfo ]; then
 				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo`+0))
@@ -361,11 +384,9 @@ case "$cmd" in
 		enter "$d0/data/xonotic-data.pk3dir" verbose
 		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
 		enter "$d0/darkplaces" verbose
-		verbose make $MAKEFLAGS sv-debug
-		verbose make $MAKEFLAGS cl-debug
-		if ! [ -n "$WE_HATE_OUR_USERS" ]; then
-			verbose make $MAKEFLAGS sdl-debug
-		fi
+		for T in $TARGETS; do
+			verbose make $MAKEFLAGS "$T"
+		done
 		;;
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then