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

This commit is contained in:
Rudolf Polzer 2018-06-13 22:01:44 +02:00
parent 9aa5cb2b9d
commit 06ce68022c
2 changed files with 13 additions and 4 deletions

View File

@ -16,6 +16,7 @@ git reset --hard origin/master
# Mode parameter:
# po: just update the translations.
# all: also update the translation template. Will create a new commit every time, as the date header changes.
export BATCH=true
sh tx.sh po
if [ x"`git ls-files -dm`" = x".tx/merge-base" ]; then

View File

@ -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,6 +198,7 @@ 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)
@ -204,20 +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
;;
*)
msg "Always need to compile libd0_blind_id on Linux `uname -m`."
compiled0=true
;;
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`."
compiled0=true
;;
esac
fi