Merge branch 'all-default-to-release' into 'master'

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 3b9b393508e5435f144a59a756b567f0d640923b..1d5d75cb57015ec2998cabfd73338383f4390945 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -27,7 +27,7 @@ case "$cmd" in
                cleanqcc=false
                cleanqc=false
                compiled0=
-               debug=debug
+               debug=release
                if [ -z "$CC" ]; then
                        export CC="gcc"
                fi
@@ -53,8 +53,11 @@ case "$cmd" in
                                        cleanqc=true
                                        shift
                                        ;;
-                               -r|-p)
+                               -d|-p|-r)
                                        case "$1" in
+                                               -d)
+                                                       debug=debug
+                                                       ;;
                                                -p)
                                                        debug=profile
                                                        ;;
@@ -86,6 +89,8 @@ case "$cmd" in
                if [ x"`uname`" = x"Darwin" ]; then
                        TARGETS="sv-$debug sdl-$debug"
                        export CC="$CC -fno-reorder-blocks"
+               elif [ -n "$WE_HATE_OUR_USERS" ]; then
+                       TARGETS="sv-$debug sdl-$debug"
                else
                        TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
@@ -104,7 +109,7 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
-                                       glx|wgl)
+                                       glx)
                                                TARGETS="$TARGETS cl-$debug"
                                                ;;
                                        dedicated)
@@ -166,7 +171,7 @@ case "$cmd" in
                                MAKEFLAGS="$MAKEFLAGS CFLAGS_SSE= CFLAGS_SSE2="
                                ;;
                esac
-               
+
                if ! verbose $CC misc/tools/conftest.c -o conftest; then
                        msg ""
                        msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -300,7 +305,6 @@ case "$cmd" in
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       client=
                        case `uname -m` in
                                x86_64)
                                        export PATH="$d0/misc/buildfiles/win64:$d0/d0_blind_id/.libs:$PATH"
@@ -312,27 +316,27 @@ case "$cmd" in
                elif [ x"`uname`" = x"Darwin" ]; then
                        export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
-                       client=-sdl
                else
                        export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-                       client=-sdl
                fi
+
+               client=-sdl
+               USE_RLWRAP=no
                case "$1" in
                        dedicated)
                                client=-$1
+                               USE_RLWRAP=
                                shift
                                ;;
-                       sdl|glx)
-                               USE_RLWRAP=no
-                               client=-$1
+                       sdl)
                                shift
                                ;;
-                       wgl)
-                               USE_RLWRAP=no
-                               client=
+                       glx)
+                               client=-$1
                                shift
                                ;;
                esac
+
                if ! [ -x "darkplaces/darkplaces$client" ]; then
                        if [ -x "darkplaces/darkplaces$client.exe" ]; then
                                client=$client.exe
@@ -383,9 +387,9 @@ case "$cmd" in
                fi
                ;;
        help)
-               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|glx|dedicated]"
                $ECHO "  $SELF update-maps"
-               $ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
+               $ECHO "  $SELF run [sdl|glx|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;