From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 18 Dec 2012 19:11:01 +0000 (+0100)
Subject: allow using gmqcc using USE_GMQCC=yes ./all compile
X-Git-Tag: xonotic-v0.7.0~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=706710d33f72123a6aac9a0cb03ad6da5733f2fe;p=xonotic%2Fxonotic.git

allow using gmqcc using USE_GMQCC=yes ./all compile
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 00bdea5c..4d168ad1 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -202,19 +202,33 @@ 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_GMQCC" = x"yes" ]; then
+			verbose cd "$d0/gmqcc"
+			if $cleanqcc; then
+				verbose make $MAKEFLAGS clean
+			fi
+			verbose make $MAKEFLAGS
+
+			verbose cd "$d0/data/xonotic-data.pk3dir"
+			if $cleanqc; then
+				verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
+			fi
+			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
+		else
+			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
+			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
 		fi
-		verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
-		#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"