SWITCH TO GMQCC. Use USE_FTEQCC=yes to use fteqcc.

[xonotic/xonotic.git] / misc / tools / all / xonotic.subr

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index fc6a498dca55af3e8053b0144bbd24c653bc5d16..bbc86c3d5402f29fb62573b9e8e9bf1a70f6fa9b 100644 (file)
--- 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"