X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=0f65ac263311e02cc4beabf5f98774b8ba0ccd8a;hb=e97d0c1514999124c80305330797b624eaabe9cf;hp=0938974ca9b46bcfa8fd36442cf7de74267d49b7;hpb=b21867380b07a080c13c6bc29eb8fffe40b51df1;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 0938974c..0f65ac26 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -87,13 +87,9 @@ case "$cmd" in
 			esac
 		done
 
+		TARGETS="sv-$debug sdl-$debug"
 		if [ x"`uname`" = x"Darwin" ]; then
-			TARGETS="sv-$debug sdl-$debug"
 			export CC="$CC -fno-reorder-blocks"
-		elif [ -n "$WE_HATE_OUR_USERS" ]; then
-			TARGETS="sv-$debug sdl-$debug"
-		else
-			TARGETS="sv-$debug cl-$debug sdl-$debug"
 		fi
 
 		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -110,9 +106,6 @@ case "$cmd" in
 					sdl)
 						TARGETS="$TARGETS sdl-$debug"
 						;;
-					glx)
-						TARGETS="$TARGETS cl-$debug"
-						;;
 					dedicated)
 						TARGETS="$TARGETS sv-$debug"
 						;;
@@ -141,6 +134,8 @@ case "$cmd" in
 			if [ -n "$WE_HATE_OUR_USERS" ]; then
 				MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
 			fi
+		elif echo $MAKEFLAGS | head -c1 | grep -qv -; then # MAKEFLAGS starts with a single letter option
+			MAKEFLAGS=-$(echo $MAKEFLAGS)                  # echo here and above will trim whitespaces
 		fi
 
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
@@ -332,10 +327,6 @@ case "$cmd" in
 			sdl)
 				shift
 				;;
-			glx)
-				client=-$1
-				shift
-				;;
 		esac
 
 		if ! [ -x "darkplaces/darkplaces$client" ]; then
@@ -348,15 +339,6 @@ case "$cmd" in
 		fi
 		set -- "darkplaces/darkplaces$client" -xonotic "$@"
 
-		# if pulseaudio is running: USE IT
-		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
-			if ps -C pulseaudio >/dev/null; then
-				if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-					export SDL_AUDIODRIVER=pulse
-				fi
-			fi
-		fi
-
 		binary=$1
 
 		if [ x"$USE_GDB" = x"yes" ]; then
@@ -388,15 +370,17 @@ case "$cmd" in
 		fi
 		;;
 	help)
-		$ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|glx|dedicated]"
+		$ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|dedicated]"
 		$ECHO "  $SELF update-maps"
-		$ECHO "  $SELF run [sdl|glx|dedicated] options..."
+		$ECHO "  $SELF run [sdl|dedicated] options..."
 		$ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
 		handled=false
 		;;
 	serverbench)
 		# TODO(rpolzer): Why does :anticheat: output differ? Total game time differs? Why?
-		verbose "$SELF" run "$@" -noconfig -nohome +exec serverbench.cfg |\
+		trap "rm -rf .serverbench_temp" 0 1 2 3 11 13 15
+		mkdir -p .serverbench_temp
+		verbose "$SELF" run dedicated "$@" -noconfig -userdir .serverbench_temp +exec serverbench.cfg |\
 			tee /dev/stderr |\
 			grep '^:' |\
 			grep -v '^:gamestart:' |\