Commit: 72f52c2daed738bd58e7d288fa969d4b7a13e1d8 Author: Martin Felke Date: Sat Oct 1 16:22:01 2016 +0200 Branches: fracture_modifier https://developer.blender.org/rB72f52c2daed738bd58e7d288fa969d4b7a13e1d8
backport of "fix Mac build for Xcode < 8" to FM branch This was added to 2.78 release branch after the merge, so adding it here too. =================================================================== M intern/ghost/intern/GHOST_SystemCocoa.mm =================================================================== diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index b0d5ab3..fac500a 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; _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
