Merge branch 'master' of github.com:mercury233/irrlicht into develop

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -37,6 +37,9 @@
 #endif
 #endif
 #endif
+#ifdef _MSC_VER
+#pragma comment(lib, "imm32.lib")
+#endif
 
 namespace irr
 {

source/Irrlicht/COpenGLDriver.cpp

@@ -143,10 +143,10 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
 	PIXELFORMATDESCRIPTOR pfd = {
 		sizeof(PIXELFORMATDESCRIPTOR),             // Size Of This Pixel Format Descriptor
 		1,                                         // Version Number
-		PFD_DRAW_TO_WINDOW |                       // Format Must Support Window
-		PFD_SUPPORT_OPENGL |                       // Format Must Support OpenGL
-		(Params.Doublebuffer?PFD_DOUBLEBUFFER:0) | // Must Support Double Buffering
-		(Params.Stereobuffer?PFD_STEREO:0),        // Must Support Stereo Buffer
+		static_cast<DWORD>(PFD_DRAW_TO_WINDOW |          // Format Must Support Window
+		 PFD_SUPPORT_OPENGL |                            // Format Must Support OpenGL
+		 (Params.Doublebuffer ? PFD_DOUBLEBUFFER : 0) |  // Must Support Double Buffering
+		 (Params.Stereobuffer ? PFD_STEREO : 0)),        // Must Support Stereo Buffer
 		PFD_TYPE_RGBA,                             // Request An RGBA Format
 		Params.Bits,                               // Select Our Color Depth
 		0, 0, 0, 0, 0, 0,                          // Color Bits Ignored

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -482,7 +482,6 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
 	IsActive(true), IsFullscreen(false), IsShiftDown(false), IsControlDown(false), IsResizable(false)
 {
 	struct utsname name;
-	NSString *path;
 
 	#ifdef _DEBUG
 	setDebugName("CIrrDeviceMacOSX");
@@ -501,11 +500,13 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
 			[NSApp finishLaunching];
 		}
 
-		path = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
-		chdir([path fileSystemRepresentation]);
-		[path release];
+		NSString* bundlePath = [[NSBundle mainBundle] bundlePath];
+		if ([[bundlePath lowercaseString] hasSuffix:@".app"]) {
+			NSString* path = [bundlePath stringByDeletingLastPathComponent];
+			chdir([path fileSystemRepresentation]);
+		}
 	}
-    NSWindow* a;
+
 	uname(&name);
 	Operator = new COSOperator(name.version);
 	os::Printer::log(name.version,ELL_INFORMATION);