initial version of ./all compile-map feature

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index fc6a498dca55af3e8053b0144bbd24c653bc5d16..9378e935172c9425d282bfc6a0937aec1bddfcf8 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -3,6 +3,15 @@ case "$cmd" in
        update-maps)
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
+       compile-map)
+               if [ ! -f "netradiant/install/q3map2.x86" ] ; then
+                       msg "q3map2 needed! Building netradiant..."
+                       cd netradiant
+                       make
+                       cd ../
+               fi
+               misc/tools/xonotic-map-compiler_from_all ./data/xonotic-maps.pk3dir/maps/$1
+               ;;
        compile)
                cleand0=false
                cleandp=false
@@ -86,19 +95,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"
@@ -122,6 +131,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,17 +219,21 @@ case "$cmd" in
                        verbose make $MAKEFLAGS
                fi
 
-               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 FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+                       verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
                fi
-               verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+               verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
                # 4 levels up: data, xonotic-data, qcsrc, server
 
                verbose cd "$d0/darkplaces"