Minor GCC fixes

src/libEGL/ShaderCache.h

@@ -42,7 +42,7 @@ class ShaderCache
     ShaderObject *create(const DWORD *function, size_t length)
     {
         std::string key(reinterpret_cast<const char*>(function), length);
-        Map::iterator it = mMap.find(key);
+        typename Map::iterator it = mMap.find(key);
         if (it != mMap.end())
         {
             it->second->AddRef();
@@ -71,7 +71,7 @@ class ShaderCache
 
     void clear()
     {
-        for (Map::iterator it = mMap.begin(); it != mMap.end(); ++it)
+        for (typename Map::iterator it = mMap.begin(); it != mMap.end(); ++it)
         {
             it->second->Release();
         }

src/libGLESv2/Context.cpp

@@ -20,11 +20,11 @@
 #include "libGLESv2/ResourceManager.h"
 #include "libGLESv2/Buffer.h"
 #include "libGLESv2/Fence.h"
-#include "libGLESv2/FrameBuffer.h"
+#include "libGLESv2/Framebuffer.h"
 #include "libGLESv2/Program.h"
 #include "libGLESv2/ProgramBinary.h"
 #include "libGLESv2/Query.h"
-#include "libGLESv2/RenderBuffer.h"
+#include "libGLESv2/Renderbuffer.h"
 #include "libGLESv2/Shader.h"
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/VertexDataManager.h"

src/libGLESv2/ProgramBinary.h

@@ -11,8 +11,8 @@
 #define LIBGLESV2_PROGRAM_BINARY_H_
 
 #define GL_APICALL
-#include <gles2/gl2.h>
-#include <gles2/gl2ext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 
 #include <d3dx9.h>
 #include <d3dcompiler.h>

src/libGLESv2/ResourceManager.cpp

@@ -11,7 +11,7 @@
 
 #include "libGLESv2/Buffer.h"
 #include "libGLESv2/Program.h"
-#include "libGLESv2/RenderBuffer.h"
+#include "libGLESv2/Renderbuffer.h"
 #include "libGLESv2/Shader.h"
 #include "libGLESv2/Texture.h"
 

src/libGLESv2/Shader.cpp

@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "GLSLANG/Shaderlang.h"
+#include "GLSLANG/ShaderLang.h"
 #include "libGLESv2/main.h"
 #include "libGLESv2/utilities.h"
 

src/libGLESv2/Shader.h

@@ -15,6 +15,7 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 #include <d3dx9.h>
+#include <string>
 #include <list>
 #include <vector>
 

src/libGLESv2/VertexDataManager.cpp

@@ -390,11 +390,11 @@ struct VertexTypeFlags
 {
 };
 
-template <unsigned int capflag, unsigned int declflag>
+template <unsigned int _capflag, unsigned int _declflag>
 struct VertexTypeFlagsHelper
 {
-    enum { capflag = capflag };
-    enum { declflag = declflag };
+    enum { capflag = _capflag };
+    enum { declflag = _declflag };
 };
 
 template <> struct VertexTypeFlags<D3DVT_FLOAT, 1> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT1> { };