X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=bbc86c3d5402f29fb62573b9e8e9bf1a70f6fa9b;hb=86bcfca17c1d646a3f11d0be32030de4b003b1ae;hp=fc6a498dca55af3e8053b0144bbd24c653bc5d16;hpb=ce98682e66519168231fe08669290011a158f24b;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index fc6a498d..bbc86c3d 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -202,17 +202,37 @@ case "$cmd" in
 			verbose make $MAKEFLAGS
 		fi
 
-		verbose cd "$d0/fteqcc"
-		if $cleanqcc; then
-			verbose make $MAKEFLAGS clean
-		fi
-		verbose make $MAKEFLAGS
+		if [ x"$USE_FTEQCC" = x"yes" ]; then
+			verbose cd "$d0/fteqcc"
+			if $cleanqcc; then
+				verbose make $MAKEFLAGS clean
+			fi
+			verbose make $MAKEFLAGS
+
+			verbose cd "$d0/data/xonotic-data.pk3dir"
+			if $cleanqc; then
+				verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+				#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+			fi
+			verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+			#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+		else
+			verbose cd "$d0/gmqcc"
+			if $cleanqcc; then
+				verbose make $MAKEFLAGS clean
+			fi
+			if [ -n "$WE_HATE_OUR_USERS" ]; then
+				verbose make $MAKEFLAGS gmqcc.exe
+			else
+				verbose make $MAKEFLAGS gmqcc
+			fi
 
-		verbose cd "$d0/data/xonotic-data.pk3dir"
-		if $cleanqc; then
-			verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+			verbose cd "$d0/data/xonotic-data.pk3dir"
+			if $cleanqc; then
+				verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
+			fi
+			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
 		fi
-		verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"