From 9b0d82950c19788dca63a5225802fd969953976e Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 14 Nov 2010 21:36:57 +0100 Subject: [PATCH] enable the rijndael lib in git builds by default --- all | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/all b/all index a51cc9f6..df9bd21e 100755 --- a/all +++ b/all @@ -892,20 +892,23 @@ case "$cmd" in mkdir -p .libs if [ -n "$WE_HATE_OUR_USERS" ]; then 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/ else case "`uname`" in Linux) case `uname -m` in x86_64) - verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/ - verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/ - MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/" + #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/ + #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_rijndael".* .libs/ + #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/ + MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/" ;; *86) - verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/ - verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/ - MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/" + #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/ + #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/ + #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/ + MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/" ;; *) compiled0=true @@ -914,6 +917,7 @@ case "$cmd" in ;; 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=true -- 2.39.2