]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - misc/tools/all/xonotic.subr
Add missing dependency for sdl compilation under mingw32
[xonotic/xonotic.git] / misc / tools / all / xonotic.subr
index dac31e19108217bf1cf0f550e971cc87e67eae87..f24a051229f249b9e4c2c9ecfa38fb0de2d2bd04 100644 (file)
@@ -17,7 +17,7 @@ case "$cmd" in
                        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"
@@ -333,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