enable the rijndael lib in git builds by default
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 20:36:57 +0000 (21:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 20:36:57 +0000 (21:36 +0100)
all

diff --git a/all b/all
index a51cc9f64547bfa4d7a527fbbb68bc67144a9974..df9bd21e9df69d3e18e26e0378db5c13e520273b 100755 (executable)
--- 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/
                        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/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)
                                                                ;;
                                                        *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
                                                                ;;
                                                        *)
                                                                compiled0=true
@@ -914,6 +917,7 @@ case "$cmd" in
                                                ;;
                                        Darwin)
                                                verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/
                                                ;;
                                        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
                                                ;;
                                        *)
                                                compiled0=true