X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=570305f8e23c3d0c00cd98aefa2e2b7fe9b8ec08;hp=3aa15837fcee39af4d5baeff43e78d056d7a249a;hb=88f17a844b514babfa35f9a5b453654bbfaf701a;hpb=bfdab051f22d11a553b69f28a294cb012b0b6c50

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 3aa15837..570305f8 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -119,6 +119,10 @@ case "$cmd" in
 			fi
 		fi
 
+		if [ -z "$MAKE" ]; then
+			MAKE=make
+		fi
+
 		if [ -z "$MAKEFLAGS" ]; then
 			ncpus=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`
 			if [ $ncpus -gt 1 ]; then
@@ -229,31 +233,36 @@ case "$cmd" in
 		if $compiled0; then
 			if $cleand0; then
 				if [ -f Makefile ]; then
-					verbose make $MAKEFLAGS distclean
+					verbose $MAKE $MAKEFLAGS distclean
 				fi
 			fi
 			if ! [ -f Makefile ]; then
 				verbose sh autogen.sh
 				verbose ./configure
 			fi
-			verbose make $MAKEFLAGS
+			verbose $MAKE $MAKEFLAGS
 		fi
 
 		verbose cd "$d0/gmqcc"
 		if $cleanqcc; then
-			verbose make $MAKEFLAGS clean
+			verbose $MAKE $MAKEFLAGS clean
 		fi
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
-			verbose make $MAKEFLAGS gmqcc.exe
+			verbose $MAKE $MAKEFLAGS gmqcc.exe
 		else
-			verbose make $MAKEFLAGS gmqcc
+			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"
@@ -261,10 +270,10 @@ case "$cmd" in
 			$ECHO "Warning: invalid empty client, default clients will be used."
 		fi
 		if $cleandp; then
-			verbose make $MAKEFLAGS clean
+			verbose $MAKE $MAKEFLAGS clean
 		fi
 		for T in $TARGETS; do
-			verbose make $MAKEFLAGS STRIP=: "$@" "$T"
+			verbose $MAKE $MAKEFLAGS STRIP=: "$@" "$T"
 		done
 		for T in $BAD_TARGETS; do
 			$ECHO "Warning: discarded invalid client $T."
@@ -281,7 +290,7 @@ case "$cmd" in
 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
 			client=-sdl
 		else
-			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
+			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 			client=-sdl
 		fi
 		case "$1" in
@@ -356,6 +365,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
 		;;