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 e18d7fe2f9d0c84efac34c9a7b95c6cd30ddc73b..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"
@@ -244,11 +264,17 @@ case "$cmd" in
                        client=-sdl
                fi
                case "$1" in
-                       sdl|glx|agl|dedicated)
+                       dedicated)
+                               client=-$1
+                               shift
+                               ;;
+                       sdl|glx|agl)
+                               USE_RLWRAP=no
                                client=-$1
                                shift
                                ;;
                        wgl)
+                               USE_RLWRAP=no
                                client=
                                shift
                                ;;
@@ -276,11 +302,16 @@ case "$cmd" in
 
                if [ x"$USE_GDB" = x"yes" ]; then
                        set -- gdb --args "$@"
-               elif [ x"$USE_GDB" = x"core" ] && which gdb >/dev/null 2>&1; then
+                       USE_RLWRAP=no
+               elif [ x"$USE_GDB" = x"core" ]; then
                        set -- gdb --batch -x savecore.gdb --args "$@"
+                       USE_RLWRAP=no
                elif which catchsegv >/dev/null 2>&1; then
                        set -- catchsegv "$@"
                fi
+               if [ x"$USE_RLWRAP" != x"no" ] && which rlwrap >/dev/null 2>&1; then
+                       set -- rlwrap -A -g '^quit' -q "\"" -r -S ']' -w 100 "$@"
+               fi
                rm -f xonotic.core
                "$@" || true
                if [ -f xonotic.core ]; then