Add missing dependency for sdl compilation under mingw32

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 2d821a35e941b0e848f8f1fd36088fc07203e8bd..f24a051229f249b9e4c2c9ecfa38fb0de2d2bd04 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -10,14 +10,14 @@ case "$cmd" in
                fi
                if ! [ -f "netradiant/install/q3map2" ] ; then
                        msg "q3map2 needed! Building netradiant..."
-                       make -C netradiant install/q3map2
+                       make -C netradiant BUILD=native install/q3map2
                fi
                for mapfile in "$@"; do
                        mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
                        if [ ! -f "$mapfile" ] ; then
                                msg "ERROR, $mapfile not found!"
                        else
-                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
+                               verbose measure_time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
                        fi
                done
                ;;
@@ -105,6 +105,9 @@ case "$cmd" in
                                case "$X" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
+                                               if [ -n "$WE_HATE_OUR_USERS" ]; then
+                                                       export PATH="$PATH:$d0/misc/builddeps/win32/sdl/bin"
+                                               fi
                                                ;;
                                        agl)
                                                TARGETS="$TARGETS cl-$debug"
@@ -145,9 +148,6 @@ case "$cmd" in
                        MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
                fi
 
-               # ODE is optional
-               MAKEFLAGS="$MAKEFLAGS LIB_ODE= CFLAGS_ODE=-DUSEODE"
-
                # workaround ARM issue in DP's makefile.inc
                case `uname -m` in
                        x86_64|*86)
@@ -197,16 +197,24 @@ case "$cmd" in
                                        Linux)
                                                case `uname -m` in
                                                        x86_64)
-                                                               #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
-                                                               #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_rijndael".* .libs/
-                                                               #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/
-                                                               MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/dp.linux64/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/dp.linux64/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/dp.linux64/lib/libd0_rijndael.a"
+                                                               # No cp commands, we want to use static linking instead.
+                                                               export CC="$CC -I../../../../misc/builddeps/linux64/d0_blind_id/include"
+                                                               export CC="$CC -L../../../../misc/builddeps/linux64/d0_blind_id/lib"
+                                                               export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/d0_blind_id/lib"
+                                                               export CC="$CC -I../../../../misc/builddeps/linux64/gmp/include"
+                                                               export CC="$CC -L../../../../misc/builddeps/linux64/gmp/lib"
+                                                               export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/gmp/lib"
+                                                               MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux64/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_rijndael.a"
                                                                ;;
                                                        *86)
-                                                               #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
-                                                               #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/
-                                                               #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
-                                                               MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/dp.linux32/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/dp.linux32/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/dp.linux32/lib/libd0_rijndael.a"
+                                                               # No cp commands, we want to use static linking instead.
+                                                               export CC="$CC -I../../../../misc/builddeps/linux32/d0_blind_id/include"
+                                                               export CC="$CC -L../../../../misc/builddeps/linux32/d0_blind_id/lib"
+                                                               export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/d0_blind_id/lib"
+                                                               export CC="$CC -I../../../../misc/builddeps/linux32/gmp/include"
+                                                               export CC="$CC -L../../../../misc/builddeps/linux32/gmp/lib"
+                                                               export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/gmp/lib"
+                                                               MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux32/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_rijndael.a"
                                                                ;;
                                                        *)
                                                                compiled0=true
@@ -328,10 +336,10 @@ case "$cmd" in
                        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 "$@"
+                       set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@"
                fi
                rm -f xonotic.core
-               "$@" || true
+               verbose measure_time "$@" || true
                if [ -f xonotic.core ]; then
                        if yesno "The program has CRASHED. Do you want to examine the core dump?"; then
                                gdb "$binary" xonotic.core