Fix interface changes from latest merge

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2365 dfc29bdd-3216-0410-991c-e03cc46cb475

include/EDriverTypes.h

@@ -51,6 +51,8 @@ namespace video
 		/** Performs hardware accelerated rendering of 3D and 2D
 		primitives. */
 		EDT_OPENGL,
+
+		//! OpenGL-ES device, for embedded and mobile systems
 		EDT_OGLES1
 	};
 
@@ -59,4 +61,3 @@ namespace video
 
 
 #endif
-

include/IrrCompileConfig.h

@@ -75,6 +75,7 @@
 #define _IRR_USE_OSX_DEVICE_
 #endif
 #endif
+#endif
 
 #if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_)
 #if defined(__sparc__) || defined(__sun__)
@@ -119,7 +120,7 @@ headers, e.g. Summer 2004.  This is a Microsoft issue, not an Irrlicht one.
 //! Define _IRR_COMPILE_WITH_OPENGL_ to compile the Irrlicht engine with OpenGL.
 /** If you do not wish the engine to be compiled with OpengGL, comment this
 define out. */
-#define _IRR_COMPILE_WITH_OPENGL_
+//#define _IRR_COMPILE_WITH_OPENGL_
 
 //! Define _IRR_COMPILE_WITH_OGLES1_ to compile the Irrlicht engine with OpenGL-ES 1.x.
 /** If you do not wish the engine to be compiled with OpenGL-ES 1.x, comment

source/Irrlicht/COGLESDriver.cpp

@@ -218,7 +218,7 @@ bool COGLES1Driver::genericDriverInit(const core::dimension2d<u32>& screenSize,
 			EglDisplay,
 #endif
 			stencilBuffer);
-	Stencilbuffer=stencilBuffer;
+	StencilBuffer=stencilBuffer;
 
 	glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
@@ -1450,7 +1450,7 @@ inline void COGLES1Driver::createGLTextureMatrix(GLfloat *o, const core::matrix4
 
 
 //! returns a device dependent texture from a software surface (IImage)
-video::ITexture* COGLES1Driver::createDeviceDependentTexture(IImage* surface, const char* name)
+video::ITexture* COGLES1Driver::createDeviceDependentTexture(IImage* surface, const core::string<c16>& name)
 {
 	return new COGLES1Texture(surface, name, this);
 }

source/Irrlicht/COGLESDriver.h

@@ -289,7 +289,7 @@ namespace video
 		bool genericDriverInit(const core::dimension2d<u32>& screenSize, bool stencilBuffer);
 
 		//! returns a device dependent texture from a software surface (IImage)
-		virtual video::ITexture* createDeviceDependentTexture(IImage* surface, const char* name);
+		virtual video::ITexture* createDeviceDependentTexture(IImage* surface, const core::string<c16>& name);
 
 		//! creates a transposed matrix in supplied GLfloat array to pass to OGLES1
 		inline void createGLMatrix(GLfloat gl_matrix[16], const core::matrix4& m);

source/Irrlicht/COGLESTexture.cpp

@@ -21,7 +21,7 @@ namespace video
 {
 
 //! constructor for usual textures
-COGLES1Texture::COGLES1Texture(IImage* origImage, const char* name, COGLES1Driver* driver)
+COGLES1Texture::COGLES1Texture(IImage* origImage, const core::string<c16>& name, COGLES1Driver* driver)
 	: ITexture(name), Driver(driver), Image(0),
 	TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA),
 	// TODO ogl-es

source/Irrlicht/COGLESTexture.h

@@ -30,7 +30,7 @@ class COGLES1Texture : public ITexture
 public:
 
 	//! constructor
-	COGLES1Texture(IImage* surface, const char* name, COGLES1Driver* driver=0);
+	COGLES1Texture(IImage* surface, const core::string<c16>& name, COGLES1Driver* driver=0);
 
 	//! destructor
 	virtual ~COGLES1Texture();