]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
if the auth library cannot be compiled, fall back to our binaries
authorRudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 13:59:05 +0000 (15:59 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 13:59:05 +0000 (15:59 +0200)
all

diff --git a/all b/all
index 9920ed88b53a27fb7621717c687adeee212fb0ad..6b19292176e806272bfad17ac795e37d57c78d7a 100755 (executable)
--- a/all
+++ b/all
@@ -668,9 +668,41 @@ case "$cmd" in
                fi
                if ! [ -f Makefile ]; then
                        verbose sh autogen.sh
-                       verbose ./configure
+                       verbose ./configure || true
+               fi
+               if ! verbose make $MAKEFLAGS; then
+                       # compilation of crypto library failed
+                       # use binaries then, if we can...
+                       mkdir -p .libs
+                       if [ -n "$WE_HATE_OUR_USERS" ]; then
+                               cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
+                               cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
+                       else
+                               case "`uname`" in
+                                       Linux)
+                                               case `uname -m` in
+                                                       x86_64)
+                                                               cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
+                                                               cp "$d0/misc/builddeps/dp.linux64/lib/libgmp.so*" .libs/
+                                                               ;;
+                                                       *86)
+                                                               cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
+                                                               cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
+                                                               ;;
+                                                       *)
+                                                               error "Please install libgmp development libraries first"
+                                                               ;;
+                                               esac
+                                               ;;
+                                       Darwin)
+                                               cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/
+                                               ;;
+                                       *)
+                                               error "Please install libgmp development libraries first"
+                                               ;;
+                               esac
+                       fi
                fi
-               verbose make $MAKEFLAGS
 
                enter "$d0/fteqcc" verbose
                if $cleanqcc; then