From 0b13b7adef0b7925466ea1bdc8a478d30cd59cae Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Tue, 27 Sep 2016 16:16:47 +0200 Subject: fix Mac build for Xcode < 8 We need a long-term fix, but this will get 2.78 out the door. --- intern/ghost/intern/GHOST_SystemCocoa.mm | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 { +#else +/* for Xcode 8 */ @interface CocoaAppDelegate : NSObject { +#endif + GHOST_SystemCocoa *systemCocoa; } - (void)setSystemCocoa:(GHOST_SystemCocoa *)sysCocoa; -- cgit v1.2.3