RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-03 18:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for precompiled versions of libd0 in dev builds

Browse Source
This commit is contained in:
bones_was_here 2023-12-24 18:40:53 +10:00
parent dfe1d7559b
commit 061d0a4975
No known key found for this signature in database
GPG Key ID: 982FE90EDA930528
1 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
misc/tools/all/xonotic.subr
View File

@ -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