mirror of
https://gitlab.com/xonotic/xonotic
synced 2025-03-05 10:57:31 +00:00
Merge branch 'master' into divVerent/crypto2
This commit is contained in:
commit
2e181ded77
8
all
8
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
|
||||
|
Loading…
Reference in New Issue
Block a user