Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix Mac build for Xcode < 8

Browse Source 
We need a long-term fix, but this will get 2.78 out the door.
This commit is contained in:
Mike Erwin
2016-09-27 16:16:47 +02:00
parent 2ebb367b0f
commit 5d0de39238
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -283,7 +283,17 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
* CocoaAppDelegate * CocoaAppDelegate
* ObjC object to capture applicationShouldTerminate, and send quit event * 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> { @interface CocoaAppDelegate : NSObject <NSApplicationDelegate> {
#endif
GHOST_SystemCocoa *systemCocoa; GHOST_SystemCocoa *systemCocoa;
} }
- (void)setSystemCocoa:(GHOST_SystemCocoa *)sysCocoa; - (void)setSystemCocoa:(GHOST_SystemCocoa *)sysCocoa;