enable the rijndael lib in git builds by default

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 93edeb54da7feda71f7ad559162d4f2c78481f74..df9bd21e9df69d3e18e26e0378db5c13e520273b 100755 (executable)
--- a/all
+++ b/all
@@ -800,7 +800,17 @@ case "$cmd" in
                                        ;;
                                -r)
                                        debug=release
-                                       export CC="$CC -g -mtune=native -march=native"
+                                       export CC="$CC -g"
+                                       case "`$CC -dumpversion`" in
+                                               [5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
+                                                       # gcc 4.3 or higher
+                                                       # -march=native is broken < 4.3
+                                                       export CC="$CC -mtune=native -march=native"
+                                                       ;;
+                                       esac
+                                       if [ -n "$WE_HATE_OUR_USERS" ]; then
+                                               export CC="$CC -fno-common"
+                                       fi
                                        shift
                                        ;;
                                *)
@@ -821,7 +831,7 @@ case "$cmd" in
                                        TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
-                       export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+                       export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
                        TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
@@ -882,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
@@ -904,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
@@ -1016,6 +1030,7 @@ case "$cmd" in
                                $ECHO "The core dump can be examined later by"
                                $ECHO "  gdb $binary xonotic.core"
                        fi
+                       exit 1
                fi
                ;;
        each|foreach)
@@ -1355,10 +1370,10 @@ case "$cmd" in
                        if $rmuntracked; then
                                case "$d" in
                                        .)
-                                               verbose git clean -df
+                                               verbose git clean -df || true
                                                ;;
                                        *)
-                                               verbose git clean -xdf
+                                               verbose git clean -xdf || true
                                                ;;
                                esac
                        fi
@@ -1368,8 +1383,8 @@ case "$cmd" in
                                                verbose git branch -D "${B#refs/heads/}"
                                        fi
                                done
-                               git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
-                               git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
+                               git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch --track master origin/master || true
+                               git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch --track "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
                        fi
                        checkself "$cmd" "$@"
                done