Renamed GL files

CamelotRenderer/CamelotRenderer.vcxproj

@@ -160,45 +160,45 @@
     <ClInclude Include="CmVertexIndexData.h" />
     <ClInclude Include="CmViewport.h" />
     <ClInclude Include="OgreWindowEventUtilities.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLATIFSInit.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLContext.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLDefaultHardwareBufferManager.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLFBOMultiRenderTarget.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLFBORenderTexture.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLFrameBufferObject.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLGpuNvparseProgram.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLGpuProgram.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLGpuProgramManager.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareBufferManager.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareIndexBuffer.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareOcclusionQuery.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwarePixelBuffer.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareVertexBuffer.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPBRenderTexture.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPBuffer.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPixelFormat.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPrerequisites.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLRenderSystem.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLATIFSInit.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLContext.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLDefaultHardwareBufferManager.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLFBOMultiRenderTarget.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLFBORenderTexture.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLFrameBufferObject.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLGpuNvparseProgram.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLGpuProgram.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLGpuProgramManager.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareBufferManager.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareIndexBuffer.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareOcclusionQuery.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwarePixelBuffer.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareVertexBuffer.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLPBRenderTexture.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLPBuffer.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLPixelFormat.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLPrerequisites.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystem.h" />
     <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystemFactory.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLRenderTexture.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLSupport.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLTexture.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreGLTextureManager.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32Context.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32GLSupport.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32Prerequisites.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32RenderTexture.h" />
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32Window.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLRenderTexture.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLSupport.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLTexture.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmGLTextureManager.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmWin32Context.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmWin32GLSupport.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmWin32Prerequisites.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmWin32RenderTexture.h" />
+    <ClInclude Include="RenderSystemGL\Include\CmWin32Window.h" />
     <ClInclude Include="RenderSystemGL\Source\atifs\include\ATI_FS_GLGpuProgram.h" />
     <ClInclude Include="RenderSystemGL\Source\atifs\include\Compiler2Pass.h" />
     <ClInclude Include="RenderSystemGL\Source\atifs\include\ps_1_4.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLExtSupport.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLGpuProgram.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLLinkProgram.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLLinkProgramManager.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLPreprocessor.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLProgram.h" />
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLProgramFactory.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLExtSupport.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLGpuProgram.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLLinkProgram.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLLinkProgramManager.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLPreprocessor.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLProgram.h" />
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLProgramFactory.h" />
     <ClInclude Include="RenderSystemGL\Source\nvparse\macro.h" />
     <ClInclude Include="RenderSystemGL\Source\nvparse\nvparse.h" />
     <ClInclude Include="RenderSystemGL\Source\nvparse\nvparse_errors.h" />
@@ -216,7 +216,7 @@
     <ClInclude Include="RenderSystemGL\Source\nvparse\_rc1.0_parser.h" />
     <ClInclude Include="RenderSystemGL\Source\nvparse\_ts1.0_parser.h" />
     <ClInclude Include="RenderSystemGL\Source\nvparse\_vs1.0_parser.h" />
-    <ClInclude Include="RenderSystemGL\Source\win32\OgreGLUtil.h" />
+    <ClInclude Include="RenderSystemGL\Source\win32\CmGLUtil.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
@@ -282,13 +282,13 @@
     <ClCompile Include="RenderSystemGL\Source\atifs\src\Compiler2Pass.cpp" />
     <ClCompile Include="RenderSystemGL\Source\atifs\src\ps_1_4.cpp" />
     <ClCompile Include="RenderSystemGL\Source\glew.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLExtSupport.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLGpuProgram.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLLinkProgram.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLLinkProgramManager.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLPreprocessor.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLProgram.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLProgramFactory.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLExtSupport.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLGpuProgram.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLLinkProgram.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLLinkProgramManager.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLPreprocessor.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLProgram.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLProgramFactory.cpp" />
     <ClCompile Include="RenderSystemGL\Source\nvparse\avp1.0_impl.cpp" />
     <ClCompile Include="RenderSystemGL\Source\nvparse\nvparse.cpp" />
     <ClCompile Include="RenderSystemGL\Source\nvparse\nvparse_errors.cpp" />
@@ -311,32 +311,32 @@
     <ClCompile Include="RenderSystemGL\Source\nvparse\_ts1.0_parser.cpp" />
     <ClCompile Include="RenderSystemGL\Source\nvparse\_vs1.0_lexer.cpp" />
     <ClCompile Include="RenderSystemGL\Source\nvparse\_vs1.0_parser.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLATIFSInit.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLContext.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLDefaultHardwareBufferManager.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLFBOMultiRenderTarget.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLFBORenderTexture.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLFrameBufferObject.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLGpuNvparseProgram.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLGpuProgram.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLGpuProgramManager.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareBufferManager.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareIndexBuffer.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareOcclusionQuery.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwarePixelBuffer.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareVertexBuffer.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLPBRenderTexture.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLPixelFormat.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLRenderSystem.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLATIFSInit.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLContext.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLDefaultHardwareBufferManager.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLFBOMultiRenderTarget.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLFBORenderTexture.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLFrameBufferObject.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLGpuNvparseProgram.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLGpuProgram.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLGpuProgramManager.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareBufferManager.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareIndexBuffer.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareOcclusionQuery.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwarePixelBuffer.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareVertexBuffer.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLPBRenderTexture.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLPixelFormat.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLRenderSystem.cpp" />
     <ClCompile Include="RenderSystemGL\Source\CmGLRenderSystemFactory.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLRenderTexture.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLSupport.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLTexture.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreGLTextureManager.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreWin32GLSupport.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreWin32RenderTexture.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\OgreWin32Window.cpp" />
-    <ClCompile Include="RenderSystemGL\Source\win32\OgreWin32Context.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLRenderTexture.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLSupport.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLTexture.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmGLTextureManager.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmWin32GLSupport.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmWin32RenderTexture.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\CmWin32Window.cpp" />
+    <ClCompile Include="RenderSystemGL\Source\win32\CmWin32Context.cpp" />
     <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

CamelotRenderer/CamelotRenderer.vcxproj.filters

@@ -131,27 +131,6 @@
     <ClInclude Include="RenderSystemGL\Source\atifs\include\ps_1_4.h">
       <Filter>RenderSystemGL\ATIFS</Filter>
     </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLExtSupport.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLGpuProgram.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLLinkProgram.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLLinkProgramManager.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLPreprocessor.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLProgram.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\GLSL\include\OgreGLSLProgramFactory.h">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClInclude>
     <ClInclude Include="RenderSystemGL\Source\nvparse\_ps1.0_parser.h">
       <Filter>RenderSystemGL\NVparse</Filter>
     </ClInclude>
@@ -203,93 +182,6 @@
     <ClInclude Include="RenderSystemGL\Source\nvparse\vs1.0_inst_list.h">
       <Filter>RenderSystemGL\NVparse</Filter>
     </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPrerequisites.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLATIFSInit.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLContext.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLDefaultHardwareBufferManager.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLFBOMultiRenderTarget.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLFBORenderTexture.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLFrameBufferObject.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLGpuNvparseProgram.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLGpuProgram.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLGpuProgramManager.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareBufferManager.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareIndexBuffer.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareOcclusionQuery.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwarePixelBuffer.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLHardwareVertexBuffer.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPBRenderTexture.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPBuffer.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLPixelFormat.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLRenderSystem.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLRenderTexture.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLSupport.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLTexture.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreGLTextureManager.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32Context.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32GLSupport.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32Prerequisites.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32RenderTexture.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\OgreWin32Window.h">
-      <Filter>RenderSystemGL\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\win32\OgreGLUtil.h">
-      <Filter>RenderSystemGL\Win32</Filter>
-    </ClInclude>
     <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystemFactory.h">
       <Filter>RenderSystemGL\Header Files</Filter>
     </ClInclude>
@@ -443,6 +335,114 @@
     <ClInclude Include="CmD3D9VideoModeList.h">
       <Filter>Header Files\D3D9RenderSystem</Filter>
     </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\win32\CmGLUtil.h">
+      <Filter>RenderSystemGL\Win32</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLExtSupport.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLGpuProgram.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLLinkProgram.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLLinkProgramManager.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLPreprocessor.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLProgram.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Source\GLSL\include\CmGLSLProgramFactory.h">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLATIFSInit.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLContext.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLDefaultHardwareBufferManager.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLFBOMultiRenderTarget.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLFBORenderTexture.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLFrameBufferObject.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLGpuNvparseProgram.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLGpuProgram.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLGpuProgramManager.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareBufferManager.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareIndexBuffer.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareOcclusionQuery.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwarePixelBuffer.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLHardwareVertexBuffer.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLPBRenderTexture.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLPBuffer.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLPixelFormat.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLPrerequisites.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystem.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLRenderTexture.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLSupport.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLTexture.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmGLTextureManager.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmWin32Context.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmWin32GLSupport.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmWin32Prerequisites.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmWin32RenderTexture.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderSystemGL\Include\CmWin32Window.h">
+      <Filter>RenderSystemGL\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -487,27 +487,6 @@
     <ClCompile Include="RenderSystemGL\Source\atifs\src\ps_1_4.cpp">
       <Filter>RenderSystemGL\ATIFS</Filter>
     </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLExtSupport.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLGpuProgram.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLLinkProgram.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLLinkProgramManager.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLPreprocessor.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLProgram.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\GLSL\src\OgreGLSLProgramFactory.cpp">
-      <Filter>RenderSystemGL\GLSL</Filter>
-    </ClCompile>
     <ClCompile Include="RenderSystemGL\Source\nvparse\_ps1.0_lexer.cpp">
       <Filter>RenderSystemGL\NVparse</Filter>
     </ClCompile>
@@ -577,81 +556,6 @@
     <ClCompile Include="RenderSystemGL\Source\glew.cpp">
       <Filter>RenderSystemGL\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLATIFSInit.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLContext.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLDefaultHardwareBufferManager.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLFBOMultiRenderTarget.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLFBORenderTexture.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLFrameBufferObject.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLGpuNvparseProgram.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLGpuProgram.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLGpuProgramManager.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareBufferManager.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareIndexBuffer.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareOcclusionQuery.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwarePixelBuffer.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLHardwareVertexBuffer.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLPBRenderTexture.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLPixelFormat.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLRenderSystem.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLRenderTexture.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLSupport.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLTexture.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreGLTextureManager.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreWin32GLSupport.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreWin32RenderTexture.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\OgreWin32Window.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\win32\OgreWin32Context.cpp">
-      <Filter>RenderSystemGL\Win32</Filter>
-    </ClCompile>
     <ClCompile Include="RenderSystemGL\Source\CmGLRenderSystemFactory.cpp">
       <Filter>RenderSystemGL\Source Files</Filter>
     </ClCompile>
@@ -796,5 +700,101 @@
     <ClCompile Include="CmD3D9VideoModeList.cpp">
       <Filter>Source Files\D3D9RenderSystem</Filter>
     </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\win32\CmWin32Context.cpp">
+      <Filter>RenderSystemGL\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLExtSupport.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLGpuProgram.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLLinkProgram.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLLinkProgramManager.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLPreprocessor.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLProgram.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\GLSL\src\CmGLSLProgramFactory.cpp">
+      <Filter>RenderSystemGL\GLSL</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLATIFSInit.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLContext.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLDefaultHardwareBufferManager.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLFBOMultiRenderTarget.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLFBORenderTexture.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLFrameBufferObject.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLGpuNvparseProgram.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLGpuProgram.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLGpuProgramManager.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareBufferManager.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareIndexBuffer.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareOcclusionQuery.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwarePixelBuffer.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLHardwareVertexBuffer.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLPBRenderTexture.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLPixelFormat.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLRenderSystem.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLRenderTexture.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLSupport.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLTexture.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmGLTextureManager.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmWin32GLSupport.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmWin32RenderTexture.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderSystemGL\Source\CmWin32Window.cpp">
+      <Filter>RenderSystemGL\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

CamelotRenderer/RenderSystemGL/Include/OgreGLATIFSInit.h → CamelotRenderer/RenderSystemGL/Include/CmGLATIFSInit.h

@@ -17,7 +17,7 @@
 #ifndef _GL_ATI_FRAGMENT_SHADER_H_
 #define _GL_ATI_FRAGMENT_SHADER_H_
 
-#include "OgreGLSupport.h"
+#include "CmGLSupport.h"
 
 // ATI_fragment_program functions
 extern PFNGLGENFRAGMENTSHADERSATIPROC        glGenFragmentShadersATI_ptr;

CamelotRenderer/RenderSystemGL/Include/OgreGLContext.h → CamelotRenderer/RenderSystemGL/Include/CmGLContext.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __OgreGLContext_H__
 #define __OgreGLContext_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLDefaultHardwareBufferManager.h → CamelotRenderer/RenderSystemGL/Include/CmGLDefaultHardwareBufferManager.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __GLDefaultHardwareBufferManager_H__
 #define __GLDefaultHardwareBufferManager_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHardwareBufferManager.h"
 #include "CmHardwareVertexBuffer.h"
 #include "CmHardwareIndexBuffer.h"

CamelotRenderer/RenderSystemGL/Include/OgreGLFBOMultiRenderTarget.h → CamelotRenderer/RenderSystemGL/Include/CmGLFBOMultiRenderTarget.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __GLMULTIRENDERTARGET_H__
 #define __GLMULTIRENDERTARGET_H__
 
-#include "OgreGLFrameBufferObject.h"
+#include "CmGLFrameBufferObject.h"
 
 namespace CamelotEngine {
 	/** MultiRenderTarget for GL. Requires the FBO extension.

CamelotRenderer/RenderSystemGL/Include/OgreGLFBORenderTexture.h → CamelotRenderer/RenderSystemGL/Include/CmGLFBORenderTexture.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __OgreGLFBORTT_H__
 #define __OgreGLFBORTT_H__
 
-#include "OgreGLRenderTexture.h"
-#include "OgreGLContext.h"
-#include "OgreGLFrameBufferObject.h"
+#include "CmGLRenderTexture.h"
+#include "CmGLContext.h"
+#include "CmGLFrameBufferObject.h"
 
 /// Extra GL constants
 #define GL_DEPTH24_STENCIL8_EXT                           0x88F0

CamelotRenderer/RenderSystemGL/Include/OgreGLFrameBufferObject.h → CamelotRenderer/RenderSystemGL/Include/CmGLFrameBufferObject.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef __OgreGLFBO_H__
 #define __OgreGLFBO_H__
 
-#include "OgreGLRenderTexture.h"
-#include "OgreGLContext.h"
+#include "CmGLRenderTexture.h"
+#include "CmGLContext.h"
 
 namespace CamelotEngine {
     

CamelotRenderer/RenderSystemGL/Include/OgreGLGpuNvparseProgram.h → CamelotRenderer/RenderSystemGL/Include/CmGLGpuNvparseProgram.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #ifndef __GLGpuNvparseProgram_H__
 #define __GLGpuNvparseProgram_H__
 
-#include "OgreGLPrerequisites.h"
-#include "OgreGLGpuProgram.h"
+#include "CmGLPrerequisites.h"
+#include "CmGLGpuProgram.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLGpuProgram.h → CamelotRenderer/RenderSystemGL/Include/CmGLGpuProgram.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __GLGpuProgram_H__
 #define __GLGpuProgram_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmGpuProgram.h"
 #include "CmHardwareVertexBuffer.h"
 

CamelotRenderer/RenderSystemGL/Include/OgreGLGpuProgramManager.h → CamelotRenderer/RenderSystemGL/Include/CmGLGpuProgramManager.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __GLGpuProgramManager_H__
 #define __GLGpuProgramManager_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmGpuProgramManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareBufferManager.h → CamelotRenderer/RenderSystemGL/Include/CmGLHardwareBufferManager.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLHARWAREBUFFERMANAGER_H__
 #define __GLHARWAREBUFFERMANAGER_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHardwareBufferManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareIndexBuffer.h → CamelotRenderer/RenderSystemGL/Include/CmGLHardwareIndexBuffer.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLHARDWAREINDEXBUFFER_H__
 #define __GLHARDWAREINDEXBUFFER_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine { 

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareOcclusionQuery.h → CamelotRenderer/RenderSystemGL/Include/CmGLHardwareOcclusionQuery.h

@@ -47,7 +47,7 @@ initialised and used in glRenderSystem and copy what is done there.
 #ifndef __GLHARDWAREOCCLUSIONQUERY_H__
 #define __GLHARDWAREOCCLUSIONQUERY_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHardwareOcclusionQuery.h"
 
 

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwarePixelBuffer.h → CamelotRenderer/RenderSystemGL/Include/CmGLHardwarePixelBuffer.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLPIXELBUFFER_H__
 #define __GLPIXELBUFFER_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareVertexBuffer.h → CamelotRenderer/RenderSystemGL/Include/CmGLHardwareVertexBuffer.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLHARDWAREVERTEXBUFFER_H__
 #define __GLHARDWAREVERTEXBUFFER_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHardwareVertexBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreGLPBRenderTexture.h → CamelotRenderer/RenderSystemGL/Include/CmGLPBRenderTexture.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #ifndef __GLPBRENDERTEXTURE_H__
 #define __GLPBRENDERTEXTURE_H__
 
-#include "OgreGLRenderTexture.h"
-#include "OgreGLPBuffer.h"
+#include "CmGLRenderTexture.h"
+#include "CmGLPBuffer.h"
 namespace CamelotEngine {
     
     /** RenderTexture that uses a PBuffer (offscreen rendering context) for rendering.

CamelotRenderer/RenderSystemGL/Include/OgreGLPBuffer.h → CamelotRenderer/RenderSystemGL/Include/CmGLPBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __GLPBUFFER_H__
 #define __GLPBUFFER_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 
 namespace CamelotEngine {
     /** An off-screen rendering context. These contexts are always RGBA for simplicity, speed and

CamelotRenderer/RenderSystemGL/Include/OgreGLPixelFormat.h → CamelotRenderer/RenderSystemGL/Include/CmGLPixelFormat.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLPIXELFORMAT_H__
 #define __GLPIXELFORMAT_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "OgrePixelFormat.h"
 namespace CamelotEngine {
     

CamelotRenderer/RenderSystemGL/Include/OgreGLRenderSystem.h → CamelotRenderer/RenderSystemGL/Include/CmGLRenderSystem.h

@@ -28,11 +28,11 @@ THE SOFTWARE.
 #ifndef __GLRenderSystem_H__
 #define __GLRenderSystem_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmRenderSystem.h"
-#include "OgreGLHardwareBufferManager.h"
-#include "OgreGLGpuProgramManager.h"
-#include "OgreGLSLProgramFactory.h"
+#include "CmGLHardwareBufferManager.h"
+#include "CmGLGpuProgramManager.h"
+#include "CmGLSLProgramFactory.h"
 #include "OgreConfigOptionMap.h"
 #include "CmVector4.h"
 

CamelotRenderer/RenderSystemGL/Include/CmGLRenderSystemFactory.h

@@ -3,7 +3,7 @@
 #include <string>
 #include "CmRenderSystemFactory.h"
 #include "CmRenderSystemManager.h"
-#include "OgreGLRenderSystem.h"
+#include "CmGLRenderSystem.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/RenderSystemGL/Include/OgreGLRenderTexture.h → CamelotRenderer/RenderSystemGL/Include/CmGLRenderTexture.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __GLRENDERTEXTURE_H__
 #define __GLRENDERTEXTURE_H__
 
-#include "OgreGLTexture.h"
+#include "CmGLTexture.h"
 
 namespace CamelotEngine {
     /** GL surface descriptor. Points to a 2D surface that can be rendered to. 

CamelotRenderer/RenderSystemGL/Include/OgreGLSupport.h → CamelotRenderer/RenderSystemGL/Include/CmGLSupport.h

@@ -28,12 +28,12 @@ THE SOFTWARE.
 #ifndef OGRE_GLSUPPORT_H
 #define OGRE_GLSUPPORT_H
 
-#include "OgreGLPrerequisites.h"
-#include "OgreGLRenderSystem.h"
+#include "CmGLPrerequisites.h"
+#include "CmGLRenderSystem.h"
 
 #include "CmRenderWindow.h"
 #include "OgreConfigOptionMap.h"
-#include "OgreGLPBuffer.h"
+#include "CmGLPBuffer.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/RenderSystemGL/Include/OgreGLTexture.h → CamelotRenderer/RenderSystemGL/Include/CmGLTexture.h

@@ -29,10 +29,10 @@ THE SOFTWARE.
 #ifndef __GLTEXTURE_H__
 #define __GLTEXTURE_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmRenderTexture.h"
 #include "CmTexture.h"
-#include "OgreGLSupport.h"
+#include "CmGLSupport.h"
 #include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreGLTextureManager.h → CamelotRenderer/RenderSystemGL/Include/CmGLTextureManager.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef __GLTextureManager_H__
 #define __GLTextureManager_H__
 
-#include "OgreGLPrerequisites.h"
-#include "OgreGLTexture.h"
-#include "OgreGLSupport.h"
+#include "CmGLPrerequisites.h"
+#include "CmGLTexture.h"
+#include "CmGLSupport.h"
 #include "CmTextureManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreWin32Context.h → CamelotRenderer/RenderSystemGL/Include/CmWin32Context.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef __OgreW32Context_H__
 #define __OgreW32Context_H__
 
-#include "OgreWin32Prerequisites.h"
-#include "OgreGLContext.h"
+#include "CmWin32Prerequisites.h"
+#include "CmGLContext.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreWin32GLSupport.h → CamelotRenderer/RenderSystemGL/Include/CmWin32GLSupport.h

@@ -1,9 +1,9 @@
 #ifndef __OgreWin32GLSupport_H__
 #define __OgreWin32GLSupport_H__
 
-#include "OgreWin32Prerequisites.h"
-#include "OgreGLSupport.h"
-#include "OgreGLRenderSystem.h"
+#include "CmWin32Prerequisites.h"
+#include "CmGLSupport.h"
+#include "CmGLRenderSystem.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/RenderSystemGL/Include/OgreWin32Prerequisites.h → CamelotRenderer/RenderSystemGL/Include/CmWin32Prerequisites.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include <windows.h>
 
-#include <OgreGLPrerequisites.h>
+#include <CmGLPrerequisites.h>
 
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/OgreWin32RenderTexture.h → CamelotRenderer/RenderSystemGL/Include/CmWin32RenderTexture.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef __Win32RT_H__
 #define __Win32RT_H__
 
-#include "OgreWin32Prerequisites.h"
-#include "OgreWin32Context.h"
-#include "OgreGLPBuffer.h"
+#include "CmWin32Prerequisites.h"
+#include "CmWin32Context.h"
+#include "CmGLPBuffer.h"
 
 namespace CamelotEngine {
     class _OgreGLExport Win32PBuffer : public GLPBuffer

CamelotRenderer/RenderSystemGL/Include/OgreWin32Window.h → CamelotRenderer/RenderSystemGL/Include/CmWin32Window.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __Win32Window_H__
 #define __Win32Window_H__
 
-#include "OgreWin32Prerequisites.h"
+#include "CmWin32Prerequisites.h"
 #include "CmRenderWindow.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLATIFSInit.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLATIFSInit.cpp

@@ -13,8 +13,8 @@
 **   also works on R300 but pointless since ARBFP1.0 supported
 */
 
-#include "OgreGLATIFSInit.h"
-#include "OgreGLPrerequisites.h"
+#include "CmGLATIFSInit.h"
+#include "CmGLPrerequisites.h"
 
 // ATI_fragment_program functions
 PFNGLGENFRAGMENTSHADERSATIPROC        glGenFragmentShadersATI_ptr=NULL;

CamelotRenderer/RenderSystemGL/Source/OgreGLContext.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLContext.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLContext.h"
+#include "CmGLContext.h"
 
 namespace CamelotEngine {
     // Empty base class
@@ -44,7 +44,7 @@ namespace CamelotEngine {
 
 #if CM_THREAD_SUPPORT == 1
 
-// declared in OgreGLPrerequisites.h 
+// declared in CmGLPrerequisites.h 
 GLEWContext * glewGetContext()
 {
 	using namespace CamelotEngine;

CamelotRenderer/RenderSystemGL/Source/OgreGLDefaultHardwareBufferManager.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLDefaultHardwareBufferManager.cpp

@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLDefaultHardwareBufferManager.h"
+#include "CmGLDefaultHardwareBufferManager.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLFBOMultiRenderTarget.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLFBOMultiRenderTarget.cpp

@@ -26,10 +26,10 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLFBOMultiRenderTarget.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLFBOMultiRenderTarget.h"
+#include "CmGLPixelFormat.h"
 #include "OgreStringConverter.h"
-#include "OgreGLHardwarePixelBuffer.h"
+#include "CmGLHardwarePixelBuffer.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/OgreGLFBORenderTexture.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLFBORenderTexture.cpp

@@ -26,11 +26,11 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLFBORenderTexture.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLFBORenderTexture.h"
+#include "CmGLPixelFormat.h"
 #include "OgreStringConverter.h"
-#include "OgreGLHardwarePixelBuffer.h"
-#include "OgreGLFBOMultiRenderTarget.h"
+#include "CmGLHardwarePixelBuffer.h"
+#include "CmGLFBOMultiRenderTarget.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/OgreGLFrameBufferObject.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLFrameBufferObject.cpp

@@ -26,11 +26,11 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLFrameBufferObject.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLFrameBufferObject.h"
+#include "CmGLPixelFormat.h"
 #include "OgreStringConverter.h"
-#include "OgreGLHardwarePixelBuffer.h"
-#include "OgreGLFBORenderTexture.h"
+#include "CmGLHardwarePixelBuffer.h"
+#include "CmGLFBORenderTexture.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLGpuNvparseProgram.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLGpuNvparseProgram.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLGpuNvparseProgram.h"
+#include "CmGLGpuNvparseProgram.h"
 #include "OgreException.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemCapabilities.h"

CamelotRenderer/RenderSystemGL/Source/OgreGLGpuProgram.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLGpuProgram.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLGpuProgram.h"
+#include "CmGLGpuProgram.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 

CamelotRenderer/RenderSystemGL/Source/OgreGLGpuProgramManager.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLGpuProgramManager.cpp

@@ -26,8 +26,8 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLGpuProgramManager.h"
-#include "OgreGLGpuProgram.h"
+#include "CmGLGpuProgramManager.h"
+#include "CmGLGpuProgram.h"
 
 using namespace CamelotEngine;
 

CamelotRenderer/RenderSystemGL/Source/OgreGLHardwareBufferManager.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLHardwareBufferManager.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLHardwareBufferManager.h"
-#include "OgreGLHardwareVertexBuffer.h"
-#include "OgreGLHardwareIndexBuffer.h"
+#include "CmGLHardwareBufferManager.h"
+#include "CmGLHardwareVertexBuffer.h"
+#include "CmGLHardwareIndexBuffer.h"
 #include "CmHardwareBuffer.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemCapabilities.h"

CamelotRenderer/RenderSystemGL/Source/OgreGLHardwareIndexBuffer.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLHardwareIndexBuffer.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLHardwareIndexBuffer.h"
-#include "OgreGLHardwareBufferManager.h"
+#include "CmGLHardwareIndexBuffer.h"
+#include "CmGLHardwareBufferManager.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLHardwareOcclusionQuery.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLHardwareOcclusionQuery.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLHardwareOcclusionQuery.h"
+#include "CmGLHardwareOcclusionQuery.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLHardwarePixelBuffer.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLHardwarePixelBuffer.cpp

@@ -25,14 +25,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLHardwarePixelBuffer.h"
-#include "OgreGLTexture.h"
-#include "OgreGLSupport.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLHardwarePixelBuffer.h"
+#include "CmGLTexture.h"
+#include "CmGLSupport.h"
+#include "CmGLPixelFormat.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 #include "OgreBitwise.h"
-#include "OgreGLFBORenderTexture.h"
+#include "CmGLFBORenderTexture.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLHardwareVertexBuffer.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLHardwareVertexBuffer.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLHardwareBufferManager.h"
-#include "OgreGLHardwareVertexBuffer.h"
+#include "CmGLHardwareBufferManager.h"
+#include "CmGLHardwareVertexBuffer.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreGLPBRenderTexture.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLPBRenderTexture.cpp

@@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLPBRenderTexture.h"
-#include "OgreGLContext.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLPBRenderTexture.h"
+#include "CmGLContext.h"
+#include "CmGLPixelFormat.h"
 #include "OgreStringConverter.h"
-#include "OgreGLHardwarePixelBuffer.h"
+#include "CmGLHardwarePixelBuffer.h"
 
 namespace CamelotEngine {
 //-----------------------------------------------------------------------------  

CamelotRenderer/RenderSystemGL/Source/OgreGLPixelFormat.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLPixelFormat.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLPixelFormat.h"
+#include "CmGLPixelFormat.h"
 #include "CmRenderSystem.h"
 #include "OgreBitwise.h"
 #include "CmRenderSystemManager.h"

CamelotRenderer/RenderSystemGL/Source/OgreGLRenderSystem.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLRenderSystem.cpp

@@ -27,26 +27,26 @@ THE SOFTWARE.s
 */
 
 
-#include "OgreGLRenderSystem.h"
+#include "CmGLRenderSystem.h"
 #include "CmRenderSystem.h"
 #include "OgreStringConverter.h"
 #include "CmCamera.h"
-#include "OgreGLTextureManager.h"
-#include "OgreGLHardwareVertexBuffer.h"
-#include "OgreGLHardwareIndexBuffer.h"
-#include "OgreGLDefaultHardwareBufferManager.h"
-#include "OgreGLUtil.h"
-#include "OgreGLGpuProgram.h"
-#include "OgreGLGpuNvparseProgram.h"
+#include "CmGLTextureManager.h"
+#include "CmGLHardwareVertexBuffer.h"
+#include "CmGLHardwareIndexBuffer.h"
+#include "CmGLDefaultHardwareBufferManager.h"
+#include "CmGLUtil.h"
+#include "CmGLGpuProgram.h"
+#include "CmGLGpuNvparseProgram.h"
 #include "ATI_FS_GLGpuProgram.h"
-#include "OgreGLGpuProgramManager.h"
+#include "CmGLGpuProgramManager.h"
 #include "OgreException.h"
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLHardwareOcclusionQuery.h"
-#include "OgreGLContext.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLHardwareOcclusionQuery.h"
+#include "CmGLContext.h"
 
-#include "OgreGLFBORenderTexture.h"
-#include "OgreGLPBRenderTexture.h"
+#include "CmGLFBORenderTexture.h"
+#include "CmGLPBRenderTexture.h"
 
 // Convenience macro from ARB_vertex_buffer_object spec
 #define VBO_BUFFER_OFFSET(i) ((char *)NULL + (i))

CamelotRenderer/RenderSystemGL/Source/OgreGLRenderTexture.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLRenderTexture.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGLRenderTexture.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLRenderTexture.h"
+#include "CmGLPixelFormat.h"
 #include "OgreStringConverter.h"
-#include "OgreGLHardwarePixelBuffer.h"
+#include "CmGLHardwarePixelBuffer.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/OgreGLSupport.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLSupport.cpp

@@ -28,8 +28,8 @@ THE SOFTWARE.
 */
 
 
-#include "OgreGLSupport.h"
-#include "OgreGLTexture.h"
+#include "CmGLSupport.h"
+#include "CmGLTexture.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/OgreGLTexture.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLTexture.cpp

@@ -26,10 +26,10 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLTexture.h"
-#include "OgreGLSupport.h"
-#include "OgreGLPixelFormat.h"
-#include "OgreGLHardwarePixelBuffer.h"
+#include "CmGLTexture.h"
+#include "CmGLSupport.h"
+#include "CmGLPixelFormat.h"
+#include "CmGLHardwarePixelBuffer.h"
 
 //#include "CmTextureManager.h"
 #include "CmCamera.h"
@@ -39,7 +39,7 @@ THE SOFTWARE.
 #include "CmTextureManager.h"
 #include "CmRenderSystemManager.h"
 
-#include "OgreGLFBORenderTexture.h"
+#include "CmGLFBORenderTexture.h"
 
 #if CM_PLATFORM == CM_PLATFORM_WIN32
 #  define WIN32_LEAN_AND_MEAN

CamelotRenderer/RenderSystemGL/Source/OgreGLTextureManager.cpp → CamelotRenderer/RenderSystemGL/Source/CmGLTextureManager.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLTextureManager.h"
+#include "CmGLTextureManager.h"
 #include "CmRenderSystem.h"
-#include "OgreGLRenderTexture.h"
+#include "CmGLRenderTexture.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/OgreWin32GLSupport.cpp → CamelotRenderer/RenderSystemGL/Source/CmWin32GLSupport.cpp

@@ -3,11 +3,11 @@
 
 #include <algorithm>
 
-#include "OgreWin32GLSupport.h"
-#include "OgreGLTexture.h"
-#include "OgreWin32Window.h"
+#include "CmWin32GLSupport.h"
+#include "CmGLTexture.h"
+#include "CmWin32Window.h"
 #include <GL/wglext.h>
-#include "OgreWin32RenderTexture.h"
+#include "CmWin32RenderTexture.h"
 
 using namespace CamelotEngine;
 

CamelotRenderer/RenderSystemGL/Source/OgreWin32RenderTexture.cpp → CamelotRenderer/RenderSystemGL/Source/CmWin32RenderTexture.cpp

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #include "CmRenderSystem.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
-#include "OgreWin32RenderTexture.h"
-#include "OgreWin32GLSupport.h"
-#include "OgreWin32Context.h"
+#include "CmWin32RenderTexture.h"
+#include "CmWin32GLSupport.h"
+#include "CmWin32Context.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/OgreWin32Window.cpp → CamelotRenderer/RenderSystemGL/Source/CmWin32Window.cpp

@@ -29,14 +29,14 @@ THE SOFTWARE.
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
-#include "OgreWin32Window.h"
+#include "CmWin32Window.h"
 #include "CmRenderSystem.h"
 #include "OgreStringConverter.h"
 #include "OgreException.h"
-#include "OgreWin32GLSupport.h"
-#include "OgreWin32Context.h"
+#include "CmWin32GLSupport.h"
+#include "CmWin32Context.h"
 #include "OgreWindowEventUtilities.h"
-#include "OgreGLPixelFormat.h"
+#include "CmGLPixelFormat.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/GLSL/include/OgreGLSLExtSupport.h → CamelotRenderer/RenderSystemGL/Source/GLSL/include/CmGLSLExtSupport.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #ifndef __GLSLExtSupport_H__
 #define __GLSLExtSupport_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 
 //
 // OpenGL Shading Language entry points

CamelotRenderer/RenderSystemGL/Source/GLSL/include/OgreGLSLGpuProgram.h → CamelotRenderer/RenderSystemGL/Source/GLSL/include/CmGLSLGpuProgram.h

@@ -30,8 +30,8 @@ THE SOFTWARE.
 #define __GLSLGpuProgram_H__
 
 // Precompiler options
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLGpuProgram.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLGpuProgram.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/GLSL/include/OgreGLSLLinkProgram.h → CamelotRenderer/RenderSystemGL/Source/GLSL/include/CmGLSLLinkProgram.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLSLLinkProgram_H__
 #define __GLSLLinkProgram_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmGpuProgram.h"
 #include "CmHardwareVertexBuffer.h"
 

CamelotRenderer/RenderSystemGL/Source/GLSL/include/OgreGLSLLinkProgramManager.h → CamelotRenderer/RenderSystemGL/Source/GLSL/include/CmGLSLLinkProgramManager.h

@@ -28,11 +28,11 @@ THE SOFTWARE.
 #ifndef __GLSLLinkProgramManager_H__
 #define __GLSLLinkProgramManager_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "OgreSingleton.h"
 
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLSLLinkProgram.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLSLLinkProgram.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/GLSL/include/OgreGLSLProgram.h → CamelotRenderer/RenderSystemGL/Source/GLSL/include/CmGLSLProgram.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLSLProgram_H__
 #define __GLSLProgram_H__
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "CmHighLevelGpuProgram.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/GLSL/include/OgreGLSLProgramFactory.h → CamelotRenderer/RenderSystemGL/Source/GLSL/include/CmGLSLProgramFactory.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #define __GLSLProgramFactory_H__
 
 #include "CmHighLevelGpuProgramManager.h"
-#include "OgreGLSLExtSupport.h"
+#include "CmGLSLExtSupport.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLExtSupport.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLExtSupport.cpp

@@ -26,8 +26,8 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLSupport.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLSupport.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLGpuProgram.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLGpuProgram.cpp

@@ -27,11 +27,11 @@ THE SOFTWARE.
 */
 
 #include "OgreException.h"
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLSLGpuProgram.h"
-#include "OgreGLSLLinkProgramManager.h"
-#include "OgreGLSLLinkProgram.h"
-#include "OgreGLSLProgram.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLSLGpuProgram.h"
+#include "CmGLSLLinkProgramManager.h"
+#include "CmGLSLLinkProgram.h"
+#include "CmGLSLProgram.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLLinkProgram.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLLinkProgram.cpp

@@ -26,12 +26,12 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLSLLinkProgram.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLSLLinkProgram.h"
 #include "OgreStringConverter.h"
-#include "OgreGLSLGpuProgram.h"
-#include "OgreGLSLProgram.h"
-#include "OgreGLSLLinkProgramManager.h"
+#include "CmGLSLGpuProgram.h"
+#include "CmGLSLProgram.h"
+#include "CmGLSLLinkProgramManager.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLLinkProgramManager.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLLinkProgramManager.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLSLLinkProgramManager.h"
-#include "OgreGLSLGpuProgram.h"
-#include "OgreGLSLProgram.h"
+#include "CmGLSLLinkProgramManager.h"
+#include "CmGLSLGpuProgram.h"
+#include "CmGLSLProgram.h"
 #include "OgreStringConverter.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLPreprocessor.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLPreprocessor.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLSLPreprocessor.h"
+#include "CmGLSLPreprocessor.h"
 
 #include <ctype.h>
 #include <stdio.h>

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLProgram.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLProgram.cpp

@@ -33,11 +33,11 @@ THE SOFTWARE.
 #include "CmHighLevelGpuProgramManager.h"
 #include "OgreException.h"
 
-#include "OgreGLSLProgram.h"
-#include "OgreGLSLGpuProgram.h"
-#include "OgreGLSLExtSupport.h"
-#include "OgreGLSLLinkProgramManager.h"
-#include "OgreGLSLPreprocessor.h"
+#include "CmGLSLProgram.h"
+#include "CmGLSLGpuProgram.h"
+#include "CmGLSLExtSupport.h"
+#include "CmGLSLLinkProgramManager.h"
+#include "CmGLSLPreprocessor.h"
 
 namespace CamelotEngine {
     //---------------------------------------------------------------------------

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLProgramFactory.cpp → CamelotRenderer/RenderSystemGL/Source/GLSL/src/CmGLSLProgramFactory.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreGLSLProgramFactory.h"
-#include "OgreGLSLLinkProgramManager.h"
-#include "OgreGLSLProgram.h"
+#include "CmGLSLProgramFactory.h"
+#include "CmGLSLLinkProgramManager.h"
+#include "CmGLSLProgram.h"
 
 namespace CamelotEngine {
     //-----------------------------------------------------------------------

CamelotRenderer/RenderSystemGL/Source/atifs/include/ATI_FS_GLGpuProgram.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #ifndef __ATI_FS_GLGpuProgram_H__
 #define __ATI_FS_GLGpuProgram_H__
 
-#include "OgreGLPrerequisites.h"
-#include "OgreGLGpuProgram.h"
+#include "CmGLPrerequisites.h"
+#include "CmGLGpuProgram.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/atifs/include/ps_1_4.h

@@ -50,7 +50,7 @@ THE SOFTWARE.
 #include <stdlib.h>
 #include <string.h>
 
-#include "OgreGLPrerequisites.h"
+#include "CmGLPrerequisites.h"
 #include "Compiler2Pass.h"
 
 

CamelotRenderer/RenderSystemGL/Source/glew.cpp

@@ -30,7 +30,7 @@
 */
 
 // SJS
-#include "OgreGLSupport.h"
+#include "CmGLSupport.h"
 // SJS
 
 #include <GL/glew.h>

CamelotRenderer/RenderSystemGL/Source/nvparse/_rc1.0_parser.cpp

@@ -59,7 +59,7 @@ THE SOFTWARE.
    There are some unavoidable exceptions within include files to
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
-#include <OgreGLPrerequisites.h>
+#include <CmGLPrerequisites.h>
 /* Identify Bison output.  */
 #define YYBISON 1
 

CamelotRenderer/RenderSystemGL/Source/nvparse/_ts1.0_parser.cpp

@@ -59,7 +59,7 @@ THE SOFTWARE.
    There are some unavoidable exceptions within include files to
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
-#include <OgreGLPrerequisites.h>
+#include <CmGLPrerequisites.h>
 /* Identify Bison output.  */
 #define YYBISON 1
 

CamelotRenderer/RenderSystemGL/Source/nvparse/nvparse_externs.h

@@ -4,7 +4,7 @@
 extern nvparse_errors errors;
 extern int line_number;
 extern char * myin;
-#include <OgreGLPrerequisites.h>
+#include <CmGLPrerequisites.h>
 #include <GL/glew.h>
 
 #endif

CamelotRenderer/RenderSystemGL/Source/nvparse/rc1.0_register.h

@@ -2,7 +2,7 @@
 #define _RC10_REGISTER_H
 
 #include <stdlib.h>
-#include <OgreGLPrerequisites.h>
+#include <CmGLPrerequisites.h>
 #include <GL/glew.h>
 
 #define RCP_NUM_GENERAL_COMBINERS 8

CamelotRenderer/RenderSystemGL/Source/nvparse/ts1.0_inst.h

@@ -3,7 +3,7 @@
 
 #define TSP_MAX_ARGS 7
 #define TSP_NUM_TEXTURE_UNITS 4
-#include <OgreGLPrerequisites.h>
+#include <CmGLPrerequisites.h>
 #ifdef _WIN32
 # define BYTE_ORDER !BIG_ENDIAN
 #endif

CamelotRenderer/RenderSystemGL/Source/win32/OgreGLUtil.h → CamelotRenderer/RenderSystemGL/Source/win32/CmGLUtil.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef INCL_OGRE_GLUTIL_H
 #define INCL_OGRE_GLUTIL_H
 
-#include "OgreWin32GLSupport.h"
+#include "CmWin32GLSupport.h"
 
 namespace CamelotEngine {
     

CamelotRenderer/RenderSystemGL/Source/win32/OgreWin32Context.cpp → CamelotRenderer/RenderSystemGL/Source/win32/CmWin32Context.cpp

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
-#include "OgreWin32Context.h"
+#include "CmWin32Context.h"
 #include "OgreException.h"
-#include "OgreGLRenderSystem.h"
+#include "CmGLRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {
@@ -101,7 +101,7 @@ namespace CamelotEngine {
 
 #if CM_THREAD_SUPPORT == 1
 
-// declared in OgreGLPrerequisites.h 
+// declared in CmGLPrerequisites.h 
 WGLEWContext * wglewGetContext()
 {
 	using namespace CamelotEngine;