Commit b15e9e9f authored by bitplane's avatar bitplane

Put ifdefs in OSX appdelegate for compiling with SDL or console devices, minor OSX project tidy up

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2240 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4eda4c8e
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
#define MACOSX // legacy support #define MACOSX // legacy support
#endif #endif
#define _IRR_OSX_PLATFORM_ #define _IRR_OSX_PLATFORM_
#if !defined(_IRR_USE_LINUX_DEVICE_) && !defined(_IRR_USE_CONSOLE_DEVICE_) #if !defined(_IRR_USE_LINUX_DEVICE_) && !defined(_IRR_USE_CONSOLE_DEVICE_) && !defined(_IRR_USE_SDL_DEVICE_)
#define _IRR_USE_OSX_DEVICE_ #define _IRR_USE_OSX_DEVICE_
#endif #endif
#endif #endif
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h // For conditions of distribution and use, see copyright notice in Irrlicht.h
#include "IrrCompileConfig.h"
#ifdef _IRR_USE_OSX_DEVICE_
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CIrrDeviceMacOSX.h" #import "CIrrDeviceMacOSX.h"
...@@ -15,3 +19,5 @@ ...@@ -15,3 +19,5 @@
- (BOOL)isQuit; - (BOOL)isQuit;
@end @end
#endif // _IRR_USE_OSX_DEVICE_
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#import "AppDelegate.h" #import "AppDelegate.h"
#ifdef _IRR_USE_OSX_DEVICE_
@implementation AppDelegate @implementation AppDelegate
- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device - (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device
...@@ -72,3 +74,5 @@ ...@@ -72,3 +74,5 @@
} }
@end @end
#endif // _IRR_USE_OSX_DEVICE_
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