new libraries for OSX

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 40ba27bed6211c8a777a36358d4c24353859678a..15a6a150d3e22c406edc8baa1d5ef6f695620490 100755 (executable)
--- a/all
+++ b/all
@@ -233,7 +233,9 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
-                               verbose git checkout "$branch"
+                               if [ "$branch" != "master" ]; then
+                                       verbose git checkout --track -b "$branch" origin/"$branch"
+                               fi
                                cd "$d0"
                        fi
                done
@@ -433,6 +435,12 @@ case "$cmd" in
        compile)
                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" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
+                       # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
+                       TARGETS="sv-debug sdl-debug"
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi
@@ -499,7 +507,7 @@ case "$cmd" in
                        client=
                        export PATH="$d0/misc/buildfiles/w32:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
-                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
                        client=-sdl
                else
                        client=-sdl
@@ -525,7 +533,7 @@ case "$cmd" in
                set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
                # if pulseaudio is running: USE IT
-               if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then
+               if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
                        if ps -C pulseaudio >/dev/null; then
                                if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
                                        export SDL_AUDIODRIVER=pulse