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

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 72e28e929697b232e145bb113c2d39ec9a515305..563a351792ddab89a51506cd6a8925610cee0332 100644 (file)
--- 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 729a18ac8aabfd25dd72e3a0020a5590d03c0688..bbc86c3d5402f29fb62573b9e8e9bf1a70f6fa9b 100644 (file)
--- 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