diff options
| author | michi_cc <michi_cc@openttd.org> | 2013-11-08 20:18:31 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2013-11-08 20:18:31 +0000 |
| commit | a41b8c851d33b7a45e8c93d1759d2cbdda031358 (patch) | |
| tree | abbc3ff95479e1edd7a57c3e29056480d1509f86 /src/video/cocoa | |
| parent | a298a6209831e068818540ed12c728a4fb299d1c (diff) | |
| download | openttd-a41b8c851d33b7a45e8c93d1759d2cbdda031358.tar.xz | |
(svn r25951) -Fix [FS#5797]: [OSX] Disable the old fullscreen sub-driver when compiling with SDK versions 10.9+.
Diffstat (limited to 'src/video/cocoa')
| -rw-r--r-- | src/video/cocoa/cocoa_v.mm | 9 | ||||
| -rw-r--r-- | src/video/cocoa/fullscreen.mm | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index 699080d15..80d0d0ddf 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -396,9 +396,12 @@ static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool f if (MacOSVersionIsAtLeast(10, 7, 0)) { ret = QZ_CreateWindowSubdriver(width, height, bpp); if (ret != NULL && fullscreen) ret->ToggleFullscreen(); - } else { + } +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9 + else { ret = fullscreen ? QZ_CreateFullscreenSubdriver(width, height, bpp) : QZ_CreateWindowSubdriver(width, height, bpp); } +#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9 */ if (ret != NULL) return ret; if (!fallback) return NULL; @@ -408,7 +411,7 @@ static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool f ret = QZ_CreateWindowSubdriver(640, 480, bpp); if (ret != NULL) return ret; -#ifdef _DEBUG +#if defined(_DEBUG) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9) /* This Fullscreen mode crashes on OSX 10.7 */ if (!MacOSVersionIsAtLeast(10, 7, 0)) { /* Try fullscreen too when in debug mode */ @@ -416,7 +419,7 @@ static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool f ret = QZ_CreateFullscreenSubdriver(640, 480, bpp); if (ret != NULL) return ret; } -#endif +#endif /* defined(_DEBUG) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9) */ return NULL; } diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm index 2d8472e7d..0683a1adb 100644 --- a/src/video/cocoa/fullscreen.mm +++ b/src/video/cocoa/fullscreen.mm @@ -17,6 +17,8 @@ #include "../../stdafx.h" +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9 + #define Rect OTTDRect #define Point OTTDPoint #import <Cocoa/Cocoa.h> @@ -518,4 +520,5 @@ CocoaSubdriver *QZ_CreateFullscreenSubdriver(int width, int height, int bpp) return ret; } +#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9 */ #endif /* WITH_COCOA */ |