update OS X startup scripts to force a 32bit arch on SDL and OS X 10.5 or lower

diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl
index 0620633f4145421bb671585497ec610bfa0ba899..6a204f0e667af26af79051eedd2b294a438a7c90 100755 (executable)
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl
+++ b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl
@@ -3,4 +3,16 @@
 export DYLD_LIBRARY_PATH="${0%/*}"
        # same dir as the executable
 
-exec "$0"-bin "$@" -notexturenonpoweroftwo
+set -- "$0"-bin "$@" -notexturenonpoweroftwo
+
+case "`sw_vers -productVersion`" in
+       # shell pattern for "10.6 and higher"
+       10.[6-9]*|10.[1-5][0-9]*|1[1-9]*|[2-9]*)
+               # no workaround needed on 10.6+
+               exec "$@"
+               ;;
+       *)
+               # need to force a 32bit arch on 10.5 and below
+               exec arch -arch i386 -arch ppc "$@"
+               ;;
+esac

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl
index 0620633f4145421bb671585497ec610bfa0ba899..baa88281819a96ff275648d7dd77d6c269a4a7e1 100755 (executable)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl
@@ -3,4 +3,6 @@
 export DYLD_LIBRARY_PATH="${0%/*}"
        # same dir as the executable
 
-exec "$0"-bin "$@" -notexturenonpoweroftwo
+set -- "$0"-bin "$@" -notexturenonpoweroftwo
+
+exec "$@"