Merge remote-tracking branch 'origin/merlijn/osxlion-windowed'

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-sdl b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-sdl
index 6a204f0e667af26af79051eedd2b294a438a7c90..30f40a955b7fa59ff18f24dd3b6af175fbca8dc1 100755 (executable)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-sdl
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-sdl
@@ -6,6 +6,10 @@ export DYLD_LIBRARY_PATH="${0%/*}"
 set -- "$0"-bin "$@" -notexturenonpoweroftwo
 
 case "`sw_vers -productVersion`" in
+       # OSX Lion has problems with SDL and running fullscreen, hence we force windowed mode
+       10.7.[0-9]*)
+               exec "$@" +vid_fullscreen 0
+               ;;
        # 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+