X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=f24a051229f249b9e4c2c9ecfa38fb0de2d2bd04;hp=2d7025f9a9ff68e89b7108b01e6f62140aeffcfc;hb=35d70b5ce898799d88ae9a44311d212899dd1390;hpb=472aad1a6126bebabc9dd0fd75f446b139583b95 diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 2d7025f9..f24a0512 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -17,7 +17,7 @@ case "$cmd" in if [ ! -f "$mapfile" ] ; then msg "ERROR, $mapfile not found!" else - verbose $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" @@ -336,7 +339,7 @@ case "$cmd" in set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@" fi rm -f xonotic.core - verbose $time "$@" || 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