blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

fix Mac build for Xcode < 8 

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 committed by Sergey Sharybin
parent 4bb1e224ba
commit 0b13b7adef
Notes: blender-bot 2023-02-14 07:31:40 +01:00 
Referenced by issue #49751, Crash when starting to render (F12) with a 3D viewport in Rendered shading mode
Referenced by issue #49609, Point density textures: vertex colors are not properly averaged
Referenced by issue #49592, Crash on "Load Factory Setting"
Referenced by issue #49557, Fire/Smoke simulator
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;