From f2373ffc5860dc1cbb2bdd72cbc9378018a72623 Mon Sep 17 00:00:00 2001
From: hybrid <hybrid@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Fri, 25 Oct 2013 16:08:45 +0000
Subject: [PATCH] Should compile under Windows again

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4595 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/COGLESDriver.cpp             |  5 ++++-
 source/Irrlicht/COGLESDriver.h               |  1 -
 source/Irrlicht/Irrlicht-gcc.cbp             |  4 ++++
 source/Irrlicht/Irrlicht10.0.vcxproj         |  8 ++++++--
 source/Irrlicht/Irrlicht10.0.vcxproj.filters | 15 ++++++++++++---
 source/Irrlicht/Irrlicht11.0.vcxproj         |  4 +++-
 source/Irrlicht/Irrlicht8.0.vcproj           | 16 ++++++++++++++++
 source/Irrlicht/Irrlicht9.0.vcproj           | 16 ++++++++++++++++
 source/Irrlicht/Makefile                     |  2 +-
 9 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp
index 68454ac3..e3c04df5 100644
--- a/source/Irrlicht/COGLESDriver.cpp
+++ b/source/Irrlicht/COGLESDriver.cpp
@@ -3,10 +3,12 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "COGLESDriver.h"
+#include "SIrrCreationParameters.h" // for createDriver function
+#include "SExposedVideoData.h" // also
+#include "IFileSystem.h" // and here as well
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
-#include "CNullDriver.h"
 #include "COGLESTexture.h"
 #include "COGLESMaterialRenderer.h"
 #include "CImage.h"
@@ -3018,6 +3020,7 @@ namespace video
 {
 
 #ifndef _IRR_COMPILE_WITH_OGLES1_
+class IVideoDriver;
 class CEGLManager;
 #endif
 
diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h
index a06e1a60..17dcd6bd 100644
--- a/source/Irrlicht/COGLESDriver.h
+++ b/source/Irrlicht/COGLESDriver.h
@@ -13,7 +13,6 @@
 #include "IMaterialRendererServices.h"
 #include "EDriverFeatures.h"
 #include "fast_atof.h"
-#include "SIrrCreationParameters.h"
 
 #ifdef _MSC_VER
 	#pragma comment(lib, "libgles_cm.lib")
diff --git a/source/Irrlicht/Irrlicht-gcc.cbp b/source/Irrlicht/Irrlicht-gcc.cbp
index ea6f863f..dd7ea991 100644
--- a/source/Irrlicht/Irrlicht-gcc.cbp
+++ b/source/Irrlicht/Irrlicht-gcc.cbp
@@ -680,6 +680,8 @@
 		<Unit filename="CDepthBuffer.h" />
 		<Unit filename="CDummyTransformationSceneNode.cpp" />
 		<Unit filename="CDummyTransformationSceneNode.h" />
+		<Unit filename="CEGLManager.cpp" />
+		<Unit filename="CEGLManager.h" />
 		<Unit filename="CEmptySceneNode.cpp" />
 		<Unit filename="CEmptySceneNode.h" />
 		<Unit filename="CFPSCounter.cpp" />
@@ -760,6 +762,8 @@
 		<Unit filename="CImageLoaderPPM.h" />
 		<Unit filename="CImageLoaderPSD.cpp" />
 		<Unit filename="CImageLoaderPSD.h" />
+		<Unit filename="CImageLoaderPVR.cpp" />
+		<Unit filename="CImageLoaderPVR.h" />
 		<Unit filename="CImageLoaderRGB.cpp" />
 		<Unit filename="CImageLoaderRGB.h" />
 		<Unit filename="CImageLoaderTGA.cpp" />
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj
index 8182462b..bcc3e78e 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj
@@ -335,7 +335,7 @@
     </ProjectReference>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;libEGL.lib;libgles_cm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\bin\Win32-visualstudio\Irrlicht.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libci.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -995,7 +995,9 @@
     <ClInclude Include="CD3D9CgMaterialRenderer.h" />
     <ClInclude Include="CDefaultSceneNodeAnimatorFactory.h" />
     <ClInclude Include="CDefaultSceneNodeFactory.h" />
+    <ClInclude Include="CEGLManager.h" />
     <ClInclude Include="CGeometryCreator.h" />
+    <ClInclude Include="CImageLoaderPVR.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
     <ClInclude Include="COpenGLCgMaterialRenderer.h" />
@@ -1256,7 +1258,9 @@
     <ClCompile Include="CD3D9CgMaterialRenderer.cpp" />
     <ClCompile Include="CDefaultSceneNodeAnimatorFactory.cpp" />
     <ClCompile Include="CDefaultSceneNodeFactory.cpp" />
+    <ClCompile Include="CEGLManager.cpp" />
     <ClCompile Include="CGeometryCreator.cpp" />
+    <ClCompile Include="CImageLoaderPVR.cpp" />
     <ClCompile Include="CMeshCache.cpp" />
     <ClCompile Include="CMeshManipulator.cpp" />
     <ClCompile Include="COpenGLCgMaterialRenderer.cpp" />
@@ -1579,4 +1583,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
index 961b8411..eaf75f81 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
@@ -1318,9 +1318,6 @@
     <ClInclude Include="COGLES2Renderer2D.h">
       <Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
     </ClInclude>
-    <ClInclude Include="COGLES2MaterialRenderer.h">
-      <Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\driverChoice.h">
       <Filter>include\video</Filter>
     </ClInclude>
@@ -1354,6 +1351,12 @@
     <ClInclude Include="..\..\include\SSharedMeshBuffer.h">
       <Filter>include\scene</Filter>
     </ClInclude>
+    <ClInclude Include="CEGLManager.h">
+      <Filter>Irrlicht\video</Filter>
+    </ClInclude>
+    <ClInclude Include="CImageLoaderPVR.h">
+      <Filter>Irrlicht\video\Null\Loader</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">
@@ -2324,6 +2327,12 @@
     <ClCompile Include="leakHunter.cpp">
       <Filter>Irrlicht\irr</Filter>
     </ClCompile>
+    <ClCompile Include="CEGLManager.cpp">
+      <Filter>Irrlicht\video</Filter>
+    </ClCompile>
+    <ClCompile Include="CImageLoaderPVR.cpp">
+      <Filter>Irrlicht\video\Null\Loader</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Irrlicht.rc" />
diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj b/source/Irrlicht/Irrlicht11.0.vcxproj
index 68913345..2caf4906 100644
--- a/source/Irrlicht/Irrlicht11.0.vcxproj
+++ b/source/Irrlicht/Irrlicht11.0.vcxproj
@@ -1000,6 +1000,7 @@
     <ClInclude Include="CD3D9CgMaterialRenderer.h" />
     <ClInclude Include="CDefaultSceneNodeAnimatorFactory.h" />
     <ClInclude Include="CDefaultSceneNodeFactory.h" />
+    <ClInclude Include="CEGLManager.h" />
     <ClInclude Include="CGeometryCreator.h" />
     <ClInclude Include="CImageLoaderPVR.h" />
     <ClInclude Include="CMeshCache.h" />
@@ -1263,6 +1264,7 @@
     <ClCompile Include="CD3D9CgMaterialRenderer.cpp" />
     <ClCompile Include="CDefaultSceneNodeAnimatorFactory.cpp" />
     <ClCompile Include="CDefaultSceneNodeFactory.cpp" />
+    <ClCompile Include="CEGLManager.cpp" />
     <ClCompile Include="CGeometryCreator.cpp" />
     <ClCompile Include="CImageLoaderPVR.cpp" />
     <ClCompile Include="CMeshCache.cpp" />
@@ -1587,4 +1589,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/source/Irrlicht/Irrlicht8.0.vcproj b/source/Irrlicht/Irrlicht8.0.vcproj
index 9499ad64..ae7c560a 100644
--- a/source/Irrlicht/Irrlicht8.0.vcproj
+++ b/source/Irrlicht/Irrlicht8.0.vcproj
@@ -1475,6 +1475,14 @@
 				RelativePath="CCgMaterialRenderer.h"
 				>
 			</File>
+			<File
+				RelativePath="CEGLManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="CEGLManager.h"
+				>
+			</File>
 			<File
 				RelativePath="CVideoModeList.cpp"
 				>
@@ -1778,6 +1786,14 @@
 					RelativePath="CImageLoaderPSD.h"
 					>
 				</File>
+				<File
+					RelativePath="CImageLoaderPVR.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderPVR.h"
+					>
+				</File>
 				<File
 					RelativePath="CImageLoaderRGB.cpp"
 					>
diff --git a/source/Irrlicht/Irrlicht9.0.vcproj b/source/Irrlicht/Irrlicht9.0.vcproj
index 16f3068a..73bb16ad 100644
--- a/source/Irrlicht/Irrlicht9.0.vcproj
+++ b/source/Irrlicht/Irrlicht9.0.vcproj
@@ -2068,6 +2068,14 @@
 					RelativePath="CCgMaterialRenderer.h"
 					>
 				</File>
+				<File
+					RelativePath="CEGLManager.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CEGLManager.h"
+					>
+				</File>
 				<File
 					RelativePath="CVideoModeList.cpp"
 					>
@@ -2490,6 +2498,14 @@
 							RelativePath="CImageLoaderPSD.h"
 							>
 						</File>
+						<File
+							RelativePath="CImageLoaderPVR.cpp"
+							>
+						</File>
+						<File
+							RelativePath="CImageLoaderPVR.h"
+							>
+						</File>
 						<File
 							RelativePath=".\CImageLoaderRGB.cpp"
 							>
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
index ea69f874..1a1ed23c 100644
--- a/source/Irrlicht/Makefile
+++ b/source/Irrlicht/Makefile
@@ -38,7 +38,7 @@ IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \
 IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctreeSceneNode.o COctreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o CSceneLoaderIrr.o
 IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o CParticleScaleAffector.o
 IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
-IRRDRVROBJ = CNullDriver.o CCgMaterialRenderer.o COpenGLCgMaterialRenderer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o COGLESDriver.o COGLESTexture.o COGLESExtensionHandler.o
+IRRDRVROBJ = CNullDriver.o CCgMaterialRenderer.o COpenGLCgMaterialRenderer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o COGLESDriver.o COGLESTexture.o COGLESExtensionHandler.o CEGLManager.o
 IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderPVR.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o CImageLoaderRGB.o \
 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
 IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)