Add a way to not compile d0_blind_id (./all compile -1).

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

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 317946aa7226013e2df2bdddc725442be486ed29..1c24f3bfb190121e0f65a8c1b966fb3bfb984cbb 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -26,7 +26,7 @@ case "$cmd" in
                cleandp=false
                cleanqcc=false
                cleanqc=false
-               compiled0=false
+               compiled0=
                debug=debug
                if [ -z "$CC" ]; then
                        export CC="gcc"
@@ -38,6 +38,10 @@ case "$cmd" in
                                        compiled0=true
                                        shift
                                        ;;
+                               -1)
+                                       compiled0=false
+                                       shift
+                                       ;;
                                -c)
                                        cleand0=true
                                        cleandp=true
@@ -183,7 +187,10 @@ case "$cmd" in
                rm -f conftest
 
                verbose cd "$d0/d0_blind_id"
-               if ! $compiled0; then
+               if [ -z "$compiled0" ]; then
+                       # In doubt, compile.
+                       compiled0=true
+
                        # compilation of crypto library failed
                        # use binaries then, if we can...
                        mkdir -p .libs
@@ -191,20 +198,11 @@ case "$cmd" in
                                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
                        else
                                case "`uname`" in
                                        Linux)
                                                case `uname -m` in
-                                                       x86_64)
-                                                               # No cp commands, we want to use static linking instead.
-                                                               export CC="$CC -I../../../../misc/builddeps/linux64/d0_blind_id/include"
-                                                               export CC="$CC -L../../../../misc/builddeps/linux64/d0_blind_id/lib"
-                                                               export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/d0_blind_id/lib"
-                                                               export CC="$CC -I../../../../misc/builddeps/linux64/gmp/include"
-                                                               export CC="$CC -L../../../../misc/builddeps/linux64/gmp/lib"
-                                                               export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/gmp/lib"
-                                                               MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux64/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_rijndael.a"
-                                                               ;;
                                                        *86)
                                                                # No cp commands, we want to use static linking instead.
                                                                export CC="$CC -I../../../../misc/builddeps/linux32/d0_blind_id/include"
@@ -214,18 +212,20 @@ case "$cmd" in
                                                                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
                                                                ;;
                                                        *)
-                                                               compiled0=true
+                                                               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
                                                ;;
                                        *)
-                                               compiled0=true
+                                               msg "Always need to compile libd0_blind_id on `uname`."
                                                ;;
                                esac
                        fi
@@ -290,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