diff options
| author | Cameron Cawley | 2018-08-19 21:12:29 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-28 15:52:23 +0200 |
| commit | 8b5f7d247a8d7900e64e3718a13ad890861032e2 (patch) | |
| tree | 634516b79a69a61033fb7e2b917613b20f4f0d62 | |
| parent | cb28ebcd1f1515aecd1b3bc81fe7b389dfa1ce6c (diff) | |
| download | scummvm-rg350-8b5f7d247a8d7900e64e3718a13ad890861032e2.tar.gz scummvm-rg350-8b5f7d247a8d7900e64e3718a13ad890861032e2.tar.bz2 scummvm-rg350-8b5f7d247a8d7900e64e3718a13ad890861032e2.zip | |
MACOSX: Fix compilation with the 10.9 SDK and below
| -rw-r--r-- | backends/platform/sdl/macosx/appmenu_osx.mm | 4 | ||||
| -rw-r--r-- | backends/platform/sdl/macosx/macosx-compat.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm index c839c20af0..9d7279f95c 100644 --- a/backends/platform/sdl/macosx/appmenu_osx.mm +++ b/backends/platform/sdl/macosx/appmenu_osx.mm @@ -35,6 +35,10 @@ #define NSEventModifierFlagOption NSAlternateKeyMask #endif +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10 +#define NSEventModifierFlags NSUInteger +#endif + // Apple added setAppleMenu in 10.5 and removed it in 10.6. // But as the method still exists we declare it ourselves here. // Yes, this works :) diff --git a/backends/platform/sdl/macosx/macosx-compat.h b/backends/platform/sdl/macosx/macosx-compat.h index 9bf1600688..4741becdf7 100644 --- a/backends/platform/sdl/macosx/macosx-compat.h +++ b/backends/platform/sdl/macosx/macosx-compat.h @@ -29,6 +29,10 @@ #define MAC_OS_X_VERSION_10_5 1050 #endif +#ifndef MAC_OS_X_VERSION_10_10 +#define MAC_OS_X_VERSION_10_10 101000 +#endif + #ifndef MAC_OS_X_VERSION_10_12 #define MAC_OS_X_VERSION_10_12 101200 #endif |