X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=35ce643154553ff53f139592e02fdb35c977475d;hb=429aa87dc92a77a471f8b46776bbf20627009014;hp=5916f5f6322d770b42483b620f30fccca5243739;hpb=a6ce9c4ba79282683a9b4069cea50998fa8909da;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 5916f5f6..35ce6431 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -8,9 +8,10 @@ case "$cmd" in
 			msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
 			msg "For example: ./all compile-map dance xoylent"
 		fi
-		if ! [ -f "netradiant/install/q3map2" ] ; then
-			msg "q3map2 needed! Building netradiant..."
-			make -C netradiant BUILD=native install/q3map2
+		if ! [ -f "netradiant/build/q3map2" ] ; then
+			msg "q3map2 needed! Building q3map2..."
+			cmake -H'netradiant' -B'netradiant/build' -G'Unix Makefiles' -D'CMAKE_BUILD_TYPE=Release' -DBUILD_RADIANT=OFF -DDOWNLOAD_GAMEPACKS=OFF
+			cmake --build 'netradiant/build' -- q3map2
 		fi
 		for mapfile in "$@"; do
 			mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
@@ -27,7 +28,7 @@ case "$cmd" in
 		cleanqcc=false
 		cleanqc=false
 		compiled0=
-		debug=debug
+		debug=release  # when changing this default, change the description in the zsh autocompletion script
 		if [ -z "$CC" ]; then
 			export CC="gcc"
 		fi
@@ -53,8 +54,11 @@ case "$cmd" in
 					cleanqc=true
 					shift
 					;;
-				-r|-p)
+				-d|-p|-r)
 					case "$1" in
+						-d)
+							debug=debug
+							;;
 						-p)
 							debug=profile
 							;;
@@ -83,9 +87,13 @@ 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
@@ -102,6 +110,9 @@ case "$cmd" in
 					sdl)
 						TARGETS="$TARGETS sdl-$debug"
 						;;
+					glx)
+						TARGETS="$TARGETS cl-$debug"
+						;;
 					dedicated)
 						TARGETS="$TARGETS sv-$debug"
 						;;
@@ -321,6 +332,10 @@ case "$cmd" in
 			sdl)
 				shift
 				;;
+			glx)
+				client=-$1
+				shift
+				;;
 		esac
 
 		if ! [ -x "darkplaces/darkplaces$client" ]; then
@@ -373,15 +388,17 @@ case "$cmd" in
 		fi
 		;;
 	help)
-		$ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|dedicated]"
+		$ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|glx|dedicated]"
 		$ECHO "  $SELF update-maps"
-		$ECHO "  $SELF run [sdl|dedicated] options..."
+		$ECHO "  $SELF run [sdl|glx|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:' |\