]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - misc/tools/all/xonotic.subr
disable fteqcc compilation
[xonotic/xonotic.git] / misc / tools / all / xonotic.subr
index bbc86c3d5402f29fb62573b9e8e9bf1a70f6fa9b..aca52d6141546688c33336591335b58ef8d9aa22 100644 (file)
@@ -86,19 +86,19 @@ case "$cmd" in
                        for X in $1; do
                                case "$X" in
                                        sdl)
-                                               TARGETS="$TARGETS sdl-debug"
+                                               TARGETS="$TARGETS sdl-$debug"
                                                ;;
                                        agl)
-                                               TARGETS="$TARGETS cl-debug"
+                                               TARGETS="$TARGETS cl-$debug"
                                                if $snowleopardhack; then
                                                        export CC="$CC -arch i386"
                                                fi
                                                ;;
                                        glx|wgl)
-                                               TARGETS="$TARGETS cl-debug"
+                                               TARGETS="$TARGETS cl-$debug"
                                                ;;
                                        dedicated)
-                                               TARGETS="$TARGETS sv-debug"
+                                               TARGETS="$TARGETS sv-$debug"
                                                ;;
                                        *)
                                                BAD_TARGETS="$BAD_TARGETS $X"
@@ -202,37 +202,21 @@ case "$cmd" in
                        verbose make $MAKEFLAGS
                fi
 
-               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
+               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 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 make $MAKEFLAGS gmqcc
+               fi
 
-                       verbose cd "$d0/data/xonotic-data.pk3dir"
-                       if $cleanqc; then
-                               verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
-                       fi
-                       verbose make QCC="../../../../gmqcc/gmqcc" "$@" $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
                # 4 levels up: data, xonotic-data, qcsrc, server
 
                verbose cd "$d0/darkplaces"