Commit 8db0549e authored by cutealien's avatar cutealien

Merge branch releases/1.8 revisions 5101:5103 into trunk:

- Fixed compilation issues with OSX SDK 10.10+


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5104 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 50c2efb3
...@@ -497,7 +497,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param) ...@@ -497,7 +497,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
{ {
[[NSAutoreleasePool alloc] init]; [[NSAutoreleasePool alloc] init];
[NSApplication sharedApplication]; [NSApplication sharedApplication];
[NSApp setDelegate:[[[AppDelegate alloc] initWithDevice:this] autorelease]]; [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
[NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
[NSApp finishLaunching]; [NSApp finishLaunching];
} }
...@@ -731,7 +731,7 @@ bool CIrrDeviceMacOSX::createWindow() ...@@ -731,7 +731,7 @@ bool CIrrDeviceMacOSX::createWindow()
{ {
[Window center]; [Window center];
} }
[Window setDelegate:[NSApp delegate]]; [Window setDelegate:(id<NSWindowDelegate>)[NSApp delegate]];
if(CreationParams.DriverType == video::EDT_OPENGL) if(CreationParams.DriverType == video::EDT_OPENGL)
[OGLContext setView:[Window contentView]]; [OGLContext setView:[Window contentView]];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment