X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=e1462c8bf9a4091a10f3ef008344c493e455c6b5;hp=3aa15837fcee39af4d5baeff43e78d056d7a249a;hb=5c85d81e949435dcd8f683bfbcedb765d00c95d0;hpb=ceb891e7b45e92bdd8dce6ad9f4dce3642600584

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 3aa15837..e1462c8b 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -249,11 +249,16 @@ case "$cmd" in
 			verbose make $MAKEFLAGS gmqcc
 		fi
 
+		if [ -n "$MSYSTEM" ]; then
+			DATAMAKE=mingw32-make
+		else
+			DATAMAKE=make
+		fi
 		verbose cd "$d0/data/xonotic-data.pk3dir"
 		if $cleanqc; then
-			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
+			verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
 		fi
-		verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
+		verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"
@@ -356,6 +361,15 @@ case "$cmd" in
 		$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 |\
+			tee /dev/stderr |\
+			grep '^:' |\
+			grep -v '^:gamestart:' |\
+			grep -v '^:anticheat:' |\
+			md5sum
+		;;
 	*)
 		handled=false
 		;;