diff options
author | egladil <egladil@openttd.org> | 2007-11-25 14:43:16 +0000 |
---|---|---|
committer | egladil <egladil@openttd.org> | 2007-11-25 14:43:16 +0000 |
commit | 1d5010edf96789140f65c0495495a24c53b5ba1b (patch) | |
tree | 8ee1ef0bc994c64d37a179e595db5424e0af4375 /src/video/cocoa/cocoa_v.mm | |
parent | 9aaa455e5d27690587a1ce1c9641ea7718874e10 (diff) | |
download | openttd-1d5010edf96789140f65c0495495a24c53b5ba1b.tar.xz |
(svn r11521) -Codechange: [OSX] Check what the running os version is in a cleaner way.
Diffstat (limited to 'src/video/cocoa/cocoa_v.mm')
-rw-r--r-- | src/video/cocoa/cocoa_v.mm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index 9aad12012..24a7a4086 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -8,6 +8,7 @@ #ifdef WITH_COCOA +#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 #include <AvailabilityMacros.h> #import <Cocoa/Cocoa.h> @@ -229,13 +230,17 @@ void QZ_GameSizeChanged() static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp) { - long sysVersion; + CocoaSubdriver *ret; - if (Gestalt(gestaltSystemVersion, &sysVersion) == noErr && sysVersion >= 0x1040) { - return QZ_CreateWindowQuartzSubdriver(width, height, bpp); + if (MacOSVersionIsAtLeast(10, 4, 0)) { + ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp); + if (ret != NULL) return ret; } - return QZ_CreateWindowQuickdrawSubdriver(width, height, bpp); + ret = QZ_CreateWindowQuickdrawSubdriver(width, height, bpp); + if (ret != NULL) return ret; + + return NULL; } @@ -282,6 +287,8 @@ const char *VideoDriver_Cocoa::Start(const char * const *parm) { int width, height, bpp; + if (!MacOSVersionIsAtLeast(10, 3, 0)) return "The Cocoa video driver requires Mac OS X 10.3 or later."; + if (_cocoa_video_started) return "Already started"; _cocoa_video_started = true; |