From 061d0a49759f9c60c6b83b0050ebf75285025213 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Sun, 24 Dec 2023 18:40:53 +1000 Subject: [PATCH] Remove support for precompiled versions of libd0 in dev builds --- misc/tools/all/xonotic.subr | 49 ------------------------------------- 1 file changed, 49 deletions(-) diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index bed2ac1f..ed698686 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -187,55 +187,6 @@ 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 -- 2.39.2