Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 38c19007c51d70c5ae19bebae1a3c1d2fe77087e..54452f88ba9292b44765cf479f141373fc48e6fb 100755 (executable)
--- a/all
+++ b/all
@@ -579,6 +579,9 @@ case "$cmd" in
                cleanqcc=false
                cleanqc=false
                debug=debug
+               if [ -z "$CC" ]; then
+                       export CC="gcc -DSUPPORTIPV6"
+               fi
                while :; do
                        case "$1" in
                                -c)
@@ -590,6 +593,7 @@ case "$cmd" in
                                        ;;
                                -r)
                                        debug=release
+                                       export CC="$CC -mtune=native -march=native"
                                        shift
                                        ;;
                                *)
@@ -597,9 +601,6 @@ case "$cmd" in
                                        ;;
                        esac
                done
-               if [ -z "$CC" ]; then
-                       export CC="gcc -DSUPPORTIPV6"
-               fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-$debug cl-$debug"
                elif [ x"`uname`" = x"Darwin" ]; then
@@ -1089,6 +1090,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
                        fi
                done
                ;;
@@ -1216,7 +1219,7 @@ case "$cmd" in
                ;;
        release-engine-win32)
                verbose "$SELF" release-compile win32 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        '' ''
                verbose "$SELF" release-compile win32 \
@@ -1247,7 +1250,7 @@ case "$cmd" in
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
-                       'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
+                       'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
                ;;