- Fixed OSX compilation issues.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4411 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/COpenGLDriver.cpp

@@ -21,6 +21,12 @@
 #include <SDL/SDL.h>
 #endif
 
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+// Objective-C++ code part
+#import "MacOSX/CIrrDeviceMacOSX.h"
+// End of objective-C++ code part
+#endif
+
 namespace irr
 {
 namespace video

source/Irrlicht/COpenGLExtensionHandler.h

@@ -30,7 +30,6 @@
 	#endif
 
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
-	#include "CIrrDeviceMacOSX.h"
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 		#define GL_GLEXT_LEGACY 1
 	#endif
@@ -2387,7 +2386,7 @@ inline void COpenGLExtensionHandler::extGlProgramParameteri(GLhandleARB program,
 #elif defined(GL_ARB_geometry_shader4)
 	glProgramParameteriARB(program, pname, value);
 #elif defined(GL_EXT_geometry_shader4)
-	glProgramParameteriEXT((long GLuint)program, pname, value);
+	glProgramParameteriEXT((long unsigned int)program, pname, value);
 #elif defined(GL_NV_geometry_program4) || defined(GL_NV_geometry_shader4)
 	glProgramParameteriNV(program, pname, value);
 #else

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.h

@@ -19,9 +19,9 @@
 #include <OpenGL/OpenGL.h>
 #include <map>
 
-class NSWindow;
-class NSOpenGLContext;
-class NSBitmapImageRep;
+@class NSWindow;
+@class NSOpenGLContext;
+@class NSBitmapImageRep;
 
 namespace irr
 {

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -13,7 +13,8 @@
 #import <Carbon/Carbon.h>
 #endif
 
-#include "CIrrDeviceMacOSX.h"
+#import "CIrrDeviceMacOSX.h"
+
 #include "IEventReceiver.h"
 #include "irrList.h"
 #include "os.h"
@@ -512,7 +513,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
 
 	initKeycodes();
 
-	VideoModeList.setDesktop(CreationParams.Bits, core::dimension2d<u32>([[NSScreen mainScreen] frame].size.width, [[NSScreen mainScreen] frame].size.height));
+	VideoModeList->setDesktop(CreationParams.Bits, core::dimension2d<u32>([[NSScreen mainScreen] frame].size.width, [[NSScreen mainScreen] frame].size.height));
 
 	bool success = true;
 	if (CreationParams.DriverType != video::EDT_NULL)
@@ -1828,7 +1829,7 @@ void CIrrDeviceMacOSX::pollJoysticks()
 
 video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
 {
-	if (!VideoModeList.getVideoModeCount())
+	if (!VideoModeList->getVideoModeCount())
 	{
 		CGDirectDisplayID display;
 		display = CGMainDisplayID();
@@ -1858,7 +1859,7 @@ video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
 				unsigned int Width = CGDisplayModeGetWidth(CurrentMode);
 				unsigned int Height = CGDisplayModeGetHeight(CurrentMode);
 
-				VideoModeList.addMode(core::dimension2d<u32>(Width, Height), Depth);
+				VideoModeList->addMode(core::dimension2d<u32>(Width, Height), Depth);
 			}
 		}
 #else
@@ -1883,7 +1884,7 @@ video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
 		}
 #endif
 	}
-	return &VideoModeList;
+	return VideoModeList;
 }
 
 } // end namespace