From 86bcfca17c1d646a3f11d0be32030de4b003b1ae Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 25 Jan 2013 09:57:12 +0100
Subject: [PATCH] SWITCH TO GMQCC. Use USE_FTEQCC=yes to use fteqcc.

---
 misc/tools/all/release.subr |  2 +-
 misc/tools/all/xonotic.subr | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 72e28e92..563a3517 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -325,7 +325,7 @@ case "$cmd" in
 		;;
 	release-qc)
 		release_common
-		verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+		verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/Xonotic/gmqcc/gmqcc.linux64" XON_BUILDSYSTEM=1 clean all
 		verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 729a18ac..bbc86c3d 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -202,36 +202,36 @@ case "$cmd" in
 			verbose make $MAKEFLAGS
 		fi
 
-		if [ x"$USE_GMQCC" = x"yes" ]; then
-			verbose cd "$d0/gmqcc"
+		if [ x"$USE_FTEQCC" = x"yes" ]; then
+			verbose cd "$d0/fteqcc"
 			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 make $MAKEFLAGS
 
 			verbose cd "$d0/data/xonotic-data.pk3dir"
 			if $cleanqc; then
-				verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
+				verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+				#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
 			fi
-			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
+			verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+			#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
 		else
-			verbose cd "$d0/fteqcc"
+			verbose cd "$d0/gmqcc"
 			if $cleanqcc; then
 				verbose make $MAKEFLAGS clean
 			fi
-			verbose make $MAKEFLAGS
+			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 QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
-				#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+				verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
 			fi
-			verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
-			#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
 		fi
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
-- 
2.39.2