X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=12d312afbc8ffca5b09203bc66687b9f1da4335a;hp=a4d195484e8d40245bd4b135b64a0c2ddcd213d9;hb=2e181ded77e2754e651cac550b7e60fe4686bf26;hpb=87a39db1a58fe7f801c51b6721515fa8e4a55251 diff --git a/all b/all index a4d19548..12d312af 100755 --- 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