Commit 5f38dfa9 authored by hybrid's avatar hybrid

Backport of patch from ogl-es branch.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2443 dfc29bdd-3216-0410-991c-e03cc46cb475
parent bf90fa16
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include "COSOperator.h" #include "COSOperator.h"
#include "CColorConverter.h" #include "CColorConverter.h"
#include "Irrlicht.h" #include "irrlicht.h"
#import <wchar.h> #import <wchar.h>
...@@ -358,7 +358,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param) ...@@ -358,7 +358,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
[NSApp finishLaunching]; [NSApp finishLaunching];
path = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent]; path = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
chdir([path cString]); chdir([path fileSystemRepresentation]);
} }
uname(&name); uname(&name);
...@@ -1436,7 +1436,7 @@ video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList() ...@@ -1436,7 +1436,7 @@ video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
return &VideoModeList; return &VideoModeList;
} }
IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationParameters& param) extern "C" IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationParameters& param)
{ {
CIrrDeviceMacOSX* dev = new CIrrDeviceMacOSX(param); CIrrDeviceMacOSX* dev = new CIrrDeviceMacOSX(param);
...@@ -1449,7 +1449,6 @@ IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationP ...@@ -1449,7 +1449,6 @@ IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationP
return dev; return dev;
} }
} } // end namespace
#endif // _IRR_USE_OSX_DEVICE_ #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