From 50cff440694e30c38d6629335ee65fee834d0f95 Mon Sep 17 00:00:00 2001 From: hybrid Date: Thu, 13 Nov 2008 00:15:58 +0000 Subject: [PATCH] Wrong texture type fixed. Support for emulator with MSVC added. git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1728 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/COGLESDriver.h | 3 ++ source/Irrlicht/COGLESTexture.cpp | 2 +- source/Irrlicht/Irrlicht9.0.vcproj | 44 +++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h index ab1fc4fd..b26f1e40 100644 --- a/source/Irrlicht/COGLESDriver.h +++ b/source/Irrlicht/COGLESDriver.h @@ -25,6 +25,9 @@ #include #include +#ifdef _MSC_VER + #pragma comment(lib, "libgles_cm.lib") +#endif namespace irr { diff --git a/source/Irrlicht/COGLESTexture.cpp b/source/Irrlicht/COGLESTexture.cpp index 6cd5b6d0..e52c1a9e 100644 --- a/source/Irrlicht/COGLESTexture.cpp +++ b/source/Irrlicht/COGLESTexture.cpp @@ -314,7 +314,7 @@ const core::dimension2d& COGLES1Texture::getSize() const //! returns driver type of texture, i.e. the driver, which created the texture E_DRIVER_TYPE COGLES1Texture::getDriverType() const { - return EDT_OPENGL; + return EDT_OGLES1; } diff --git a/source/Irrlicht/Irrlicht9.0.vcproj b/source/Irrlicht/Irrlicht9.0.vcproj index 948c758f..071781c2 100644 --- a/source/Irrlicht/Irrlicht9.0.vcproj +++ b/source/Irrlicht/Irrlicht9.0.vcproj @@ -752,11 +752,11 @@ > + + + + + + + + + + + + - - - - @@ -2287,6 +2303,14 @@ RelativePath="COBJMeshWriter.h" > + + + +