diff options
author | Mike Erwin <significant.bit@gmail.com> | 2016-09-27 17:16:47 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-28 11:41:56 +0300 |
commit | 0b13b7adef0b7925466ea1bdc8a478d30cd59cae (patch) | |
tree | bcbb37f5e6827a808b620fb7b8efdb81863fe419 | |
parent | 4bb1e224ba42ee8d37a526acfe17ad28d3673435 (diff) |
fix Mac build for Xcode < 8v2.78
We need a long-term fix, but this will get 2.78 out the door.
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index b0d5ab31ce3..fac500aa852 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -285,7 +285,17 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) * CocoaAppDelegate * ObjC object to capture applicationShouldTerminate, and send quit event **/ +#if defined(__clang_major__) && __clang_major__ <= 7 +/* FIXME(merwin & Juicyfruit): long-term fix for proper protocol to use + * merwin thinks NSApplicationDelegate is the correct protocol here. Has been around since 10.6 so we should be good... what's the problem? + * https://developer.apple.com/reference/appkit/nsapplicationdelegate?language=objc + */ +@interface CocoaAppDelegate : NSObject <NSFileManagerDelegate> { +#else +/* for Xcode 8 */ @interface CocoaAppDelegate : NSObject <NSApplicationDelegate> { +#endif + GHOST_SystemCocoa *systemCocoa; } - (void)setSystemCocoa:(GHOST_SystemCocoa *)sysCocoa; |