Merge branch 'master' into divVerent/crypto2

diff --git a/all b/all
index a4d195484e8d40245bd4b135b64a0c2ddcd213d9..12d312afbc8ffca5b09203bc66687b9f1da4335a 100755 (executable)
--- a/all
+++ b/all
@@ -521,11 +521,11 @@ case "$cmd" in
                done
                ;;
        compile)
+               if [ -z "$CC" ]; then
+                       export CC="gcc -DSUPPORT_IPV6"
+               fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-debug cl-debug"
-                       if [ -z "$CC" ]; then
-                               export CC=gcc
-                       fi
                elif [ x"`uname`" = x"Darwin" ]; then
                        case "`uname -r`" in
                                ?.*)
@@ -536,7 +536,7 @@ case "$cmd" in
                                        TARGETS="sv-debug sdl-debug"
                                        ;;
                        esac
-                       export CC="gcc -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 -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