Honor LD_LIBRARY_PATH

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 96a82a3007cd8406e021940a4bb0fb0b5114b919..570305f8e23c3d0c00cd98aefa2e2b7fe9b8ec08 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -28,7 +28,6 @@ case "$cmd" in
                cleanqc=false
                compiled0=false
                debug=debug
-               snowleopardhack=false
                if [ -z "$CC" ]; then
                        export CC="gcc"
                fi
@@ -46,6 +45,10 @@ case "$cmd" in
                                        cleanqc=true
                                        shift
                                        ;;
+                               -qc)
+                                       cleanqc=true
+                                       shift
+                                       ;;
                                -r|-p)
                                        case "$1" in
                                                -p)
@@ -75,23 +78,14 @@ case "$cmd" in
                                        ;;
                        esac
                done
-               if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       TARGETS="sv-$debug cl-$debug"
-               elif [ x"`uname`" = x"Darwin" ]; then
-                       case "`uname -r`" in
-                               ?.*)
-                                       TARGETS="sv-$debug cl-$debug sdl-$debug"
-                                       ;;
-                               *)
-                                       # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
-                                       snowleopardhack=true
-                                       TARGETS="sv-$debug sdl-$debug"
-                                       ;;
-                       esac
-                       export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
+
+               if [ x"`uname`" = x"Darwin" ]; then
+                       TARGETS="sv-$debug sdl-$debug"
+                       export CC="$CC -fno-reorder-blocks"
                else
                        TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
+
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
                        # if we give the command make the arg "", it will surely fail (invalid filename),
                        # so better handle it as an empty client option
@@ -106,12 +100,6 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
-                                       agl)
-                                               TARGETS="$TARGETS cl-$debug"
-                                               if $snowleopardhack; then
-                                                       export CC="$CC -arch i386"
-                                               fi
-                                               ;;
                                        glx|wgl)
                                                TARGETS="$TARGETS cl-$debug"
                                                ;;
@@ -130,6 +118,11 @@ case "$cmd" in
                                BAD_TARGETS=
                        fi
                fi
+
+               if [ -z "$MAKE" ]; then
+                       MAKE=make
+               fi
+
                if [ -z "$MAKEFLAGS" ]; then
                        ncpus=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`
                        if [ $ncpus -gt 1 ]; then
@@ -140,11 +133,20 @@ case "$cmd" in
                        fi
                fi
 
-               # win32: don't rely on jpeg includes
                if [ -n "$WE_HATE_OUR_USERS" ]; then
+                       # win32: use SDL2
+                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
+
+                       # win32: don't rely on jpeg includes
                        MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
                fi
 
+               if [ x"`uname`" = x"Darwin" ]; then
+                       # osx: use SDL2
+                       f=$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks
+                       MAKEFLAGS="$MAKEFLAGS SDLCONFIG_MACOSXCFLAGS=-I$f/SDL2.framework/Headers SDLCONFIG_MACOSXLIBS=-F$f SDLCONFIG_MACOSXLIBS+=-framework SDLCONFIG_MACOSXLIBS+=SDL2 SDLCONFIG_MACOSXLIBS+=-framework SDLCONFIG_MACOSXLIBS+=Cocoa SDLCONFIG_MACOSXLIBS+=-I$f/SDL2.framework/Headers SDLCONFIG_MACOSXSTATICLIBS=-F$f SDLCONFIG_MACOSXSTATICLIBS+=-framework SDLCONFIG_MACOSXSTATICLIBS+=SDL2 SDLCONFIG_MACOSXSTATICLIBS+=-framework SDLCONFIG_MACOSXSTATICLIBS+=Cocoa SDLCONFIG_MACOSXSTATICLIBS+=-I$f/SDL2.framework/Headers"
+               fi
+
                # workaround ARM issue in DP's makefile.inc
                case `uname -m` in
                        x86_64|*86)
@@ -231,31 +233,36 @@ case "$cmd" in
                if $compiled0; then
                        if $cleand0; then
                                if [ -f Makefile ]; then
-                                       verbose make $MAKEFLAGS distclean
+                                       verbose $MAKE $MAKEFLAGS distclean
                                fi
                        fi
                        if ! [ -f Makefile ]; then
                                verbose sh autogen.sh
                                verbose ./configure
                        fi
-                       verbose make $MAKEFLAGS
+                       verbose $MAKE $MAKEFLAGS
                fi
 
                verbose cd "$d0/gmqcc"
                if $cleanqcc; then
-                       verbose make $MAKEFLAGS clean
+                       verbose $MAKE $MAKEFLAGS clean
                fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       verbose make $MAKEFLAGS gmqcc.exe
+                       verbose $MAKE $MAKEFLAGS gmqcc.exe
                else
-                       verbose make $MAKEFLAGS gmqcc
+                       verbose $MAKE $MAKEFLAGS gmqcc
                fi
 
+               if [ -n "$MSYSTEM" ]; then
+                       DATAMAKE=mingw32-make
+               else
+                       DATAMAKE=$MAKE
+               fi
                verbose cd "$d0/data/xonotic-data.pk3dir"
                if $cleanqc; then
-                       verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
+                       verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
                fi
-               verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
+               verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
                # 4 levels up: data, xonotic-data, qcsrc, server
 
                verbose cd "$d0/darkplaces"
@@ -263,10 +270,10 @@ case "$cmd" in
                        $ECHO "Warning: invalid empty client, default clients will be used."
                fi
                if $cleandp; then
-                       verbose make $MAKEFLAGS clean
+                       verbose $MAKE $MAKEFLAGS clean
                fi
                for T in $TARGETS; do
-                       verbose make $MAKEFLAGS STRIP=: "$@" "$T"
+                       verbose $MAKE $MAKEFLAGS STRIP=: "$@" "$T"
                done
                for T in $BAD_TARGETS; do
                        $ECHO "Warning: discarded invalid client $T."
@@ -283,7 +290,7 @@ case "$cmd" in
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
                        client=-sdl
                else
-                       export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
+                       export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
                        client=-sdl
                fi
                case "$1" in
@@ -291,7 +298,7 @@ case "$cmd" in
                                client=-$1
                                shift
                                ;;
-                       sdl|glx|agl)
+                       sdl|glx)
                                USE_RLWRAP=no
                                client=-$1
                                shift
@@ -352,12 +359,21 @@ case "$cmd" in
                fi
                ;;
        help)
-               $ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
                $ECHO "  $SELF update-maps"
-               $ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+               $ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;
+       serverbench)
+               # TODO(rpolzer): Why does :anticheat: output differ? Total game time differs? Why?
+               verbose "$SELF" run "$@" -noconfig -nohome +exec serverbench.cfg |\
+                       tee /dev/stderr |\
+                       grep '^:' |\
+                       grep -v '^:gamestart:' |\
+                       grep -v '^:anticheat:' |\
+                       md5sum
+               ;;
        *)
                handled=false
                ;;