workaround ARM issue in DP's makefile.inc

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 405c0ff47d841656ff84f39ca061ff6888e6b39d..0379abdc9b0a8473f198514ffbe069ad9e95584c 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -122,6 +122,14 @@ case "$cmd" in
                        fi
                fi
 
+               # workaround ARM issue in DP's makefile.inc
+               case `uname -m` in
+                       x86_64|*86)
+                               ;;
+                       *)
+                               MAKEFLAGS="$MAKEFLAGS CFLAGS_SSE= CFLAGS_SSE2="
+                               ;;
+               esac
                
                if ! verbose $CC misc/tools/conftest.c -o conftest; then
                        msg ""
@@ -202,37 +210,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/gmqcc" "$@" $MAKEFLAGS clean
                fi
+               verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
                # 4 levels up: data, xonotic-data, qcsrc, server
 
                verbose cd "$d0/darkplaces"