mirror of
https://gitlab.com/xonotic/xonotic
synced 2024-12-15 19:35:24 +00:00
compile against shipped SDL
This commit is contained in:
parent
b93c58b5af
commit
347996194d
9
all
9
all
@ -424,9 +424,13 @@ case "$cmd" in
|
|||||||
if [ -z "$CC" ]; then
|
if [ -z "$CC" ]; then
|
||||||
export CC=gcc
|
export CC=gcc
|
||||||
fi
|
fi
|
||||||
elif [ x"`uname`" = x"Darwin" ] && { [ -d /Library/Frameworks/SDL.framework ] || [ -d "$HOME/Library/Frameworks/SDL.framework" ]; }; then
|
elif [ x"`uname`" = x"Darwin" ] && [ x"`uname -r`" = x"10.3.0" ]; then
|
||||||
# AGL is broken in Snow Leopard, so let's default to SDL if it is available.
|
|
||||||
TARGETS="sv-debug sdl-debug"
|
TARGETS="sv-debug sdl-debug"
|
||||||
|
# AGL is broken in Snow Leopard, so default to SDL.
|
||||||
|
if [ x"`uname -r`" != x"10.3.0" ]; then
|
||||||
|
TARGETS="$TARGETS cl-debug"
|
||||||
|
fi
|
||||||
|
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"
|
||||||
else
|
else
|
||||||
TARGETS="sv-debug cl-debug sdl-debug"
|
TARGETS="sv-debug cl-debug sdl-debug"
|
||||||
fi
|
fi
|
||||||
@ -511,6 +515,7 @@ case "$cmd" in
|
|||||||
export PATH="$d0/misc/buildfiles/w32:$PATH"
|
export PATH="$d0/misc/buildfiles/w32:$PATH"
|
||||||
elif [ x"`uname`" = x"Darwin" ]; then
|
elif [ x"`uname`" = x"Darwin" ]; then
|
||||||
export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
|
export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
|
||||||
|
export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
|
||||||
client=-sdl
|
client=-sdl
|
||||||
else
|
else
|
||||||
client=-sdl
|
client=-sdl
|
||||||
|
Loading…
Reference in New Issue
Block a user