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 eb2bbe994b1d0cacc832add45a0c6dc2e8158f1d..ed69868601535f7b482f3cbe6e78f28235227c3e 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -187,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