Explicitly specify linking of all autobuild engine libs

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 433073159b029518f0aea1ab264ba21234426c02..ed69868601535f7b482f3cbe6e78f28235227c3e 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -32,7 +32,6 @@ case "$cmd" in
                if [ -z "$CC" ]; then
                        export CC="gcc"
                fi
-               export CC="$CC -DSUPPORTIPV6"
                while :; do
                        case "$1" in
                                -0)
@@ -87,13 +86,9 @@ case "$cmd" in
                        esac
                done
 
+               TARGETS="sv-$debug sdl-$debug"
                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
 
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -110,9 +105,6 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
-                                       glx)
-                                               TARGETS="$TARGETS cl-$debug"
-                                               ;;
                                        dedicated)
                                                TARGETS="$TARGETS sv-$debug"
                                                ;;
@@ -141,19 +133,11 @@ case "$cmd" in
                        if [ -n "$WE_HATE_OUR_USERS" ]; then
                                MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
                        fi
+               elif echo $MAKEFLAGS | head -c1 | grep -qv -; then # MAKEFLAGS starts with a single letter option
+                       MAKEFLAGS=-$(echo $MAKEFLAGS)                  # echo here and above will trim whitespaces
                fi
 
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       # win32: use SDL2
-                       case `uname -m` in
-                               x86_64)
-                                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win64/sdl/bin/sdl2-config"
-                                       ;;
-                               *)
-                                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
-                                       ;;
-                       esac
-
                        # win32: don't rely on jpeg includes
                        MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
                fi
@@ -203,65 +187,12 @@ case "$cmd" in
                if [ -z "$compiled0" ]; then
                        # In doubt, compile.
                        compiled0=true
-
-                       # compilation of crypto library failed
-                       # use binaries then, if we can...
-                       mkdir -p .libs
-                       if [ -n "$WE_HATE_OUR_USERS" ]; then
-                               case `uname -m` in
-                                       x86_64)
-                                               verbose cp "$d0/misc/buildfiles/win64/libd0_blind_id"-* .libs/
-                                               verbose cp "$d0/misc/buildfiles/win64/libd0_rijndael"-* .libs/
-                                               verbose cp "$d0/misc/buildfiles/win64/libgmp"-* .libs/
-                                               compiled0=false
-                                               ;;
-                                       *)
-                                               verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
-                                               verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
-                                               verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
-                                               compiled0=false
-                                               ;;
-                               esac
-                       else
-                               case "`uname`" in
-                                       Linux)
-                                               case `uname -m` in
-                                                       *86)
-                                                               # 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=false
-                                                               ;;
-                                                       *)
-                                                               msg "Always need to compile libd0_blind_id on Linux `uname -m`."
-                                                               ;;
-                                               esac
-                                               ;;
-                                       Darwin)
-                                               verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/
-                                               verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael".* .libs/
-                                               compiled0=false
-                                               ;;
-                                       *)
-                                               msg "Always need to compile libd0_blind_id on `uname`."
-                                               ;;
-                               esac
-                       fi
                fi
                if $compiled0; then
+                       verbose sh autogen.sh
+                       verbose ./configure
                        if $cleand0; then
-                               if [ -f Makefile ]; then
-                                       verbose $MAKE $MAKEFLAGS distclean
-                               fi
-                       fi
-                       if ! [ -f Makefile ]; then
-                               verbose sh autogen.sh
-                               verbose ./configure
+                               verbose $MAKE $MAKEFLAGS distclean
                        fi
                        verbose $MAKE $MAKEFLAGS
                fi
@@ -332,10 +263,6 @@ case "$cmd" in
                        sdl)
                                shift
                                ;;
-                       glx)
-                               client=-$1
-                               shift
-                               ;;
                esac
 
                if ! [ -x "darkplaces/darkplaces$client" ]; then
@@ -379,9 +306,9 @@ case "$cmd" in
                fi
                ;;
        help)
-               $ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|glx|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|dedicated]"
                $ECHO "  $SELF update-maps"
-               $ECHO "  $SELF run [sdl|glx|dedicated] options..."
+               $ECHO "  $SELF run [sdl|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;