New structure compiles

CamelotGLRenderer/CamelotGLRenderer.vcxproj

@@ -53,7 +53,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>glu32.lib;opengl32.lib;CamelotRenderer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>glu32.lib;opengl32.lib;CamelotRenderer.lib;CamelotUtility.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>..lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
       <AdditionalLibraryDirectories>..\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -71,7 +71,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>glu32.lib;opengl32.lib;CamelotRenderer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>glu32.lib;opengl32.lib;CamelotRenderer.lib;CamelotUtility.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>..lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
       <AdditionalLibraryDirectories>..\lib\$(Configuration)</AdditionalLibraryDirectories>
     </Link>

CamelotRenderer/CamelotRenderer.vcxproj

@@ -99,32 +99,6 @@
     <ClInclude Include="Include\CmCamera.h" />
     <ClInclude Include="Include\CmCommon.h" />
     <ClInclude Include="Include\CmConfigOptionMap.h" />
-    <ClInclude Include="Include\CmD3D9Device.h" />
-    <ClInclude Include="Include\CmD3D9DeviceManager.h" />
-    <ClInclude Include="Include\CmD3D9Driver.h" />
-    <ClInclude Include="Include\CmD3D9DriverList.h" />
-    <ClInclude Include="Include\CmD3D9GpuProgram.h" />
-    <ClInclude Include="Include\CmD3D9GpuProgramManager.h" />
-    <ClInclude Include="Include\CmD3D9HardwareBufferManager.h" />
-    <ClInclude Include="Include\CmD3D9HardwareIndexBuffer.h" />
-    <ClInclude Include="Include\CmD3D9HardwareOcclusionQuery.h" />
-    <ClInclude Include="Include\CmD3D9HardwarePixelBuffer.h" />
-    <ClInclude Include="Include\CmD3D9HardwareVertexBuffer.h" />
-    <ClInclude Include="Include\CmD3D9HLSLProgram.h" />
-    <ClInclude Include="Include\CmD3D9HLSLProgramFactory.h" />
-    <ClInclude Include="Include\CmD3D9Mappings.h" />
-    <ClInclude Include="Include\CmD3D9MultiRenderTarget.h" />
-    <ClInclude Include="Include\CmD3D9Prerequisites.h" />
-    <ClInclude Include="Include\CmD3D9RenderSystem.h" />
-    <ClInclude Include="Include\CmD3D9RenderSystemFactory.h" />
-    <ClInclude Include="Include\CmD3D9RenderWindow.h" />
-    <ClInclude Include="Include\CmD3D9Resource.h" />
-    <ClInclude Include="Include\CmD3D9ResourceManager.h" />
-    <ClInclude Include="Include\CmD3D9Texture.h" />
-    <ClInclude Include="Include\CmD3D9TextureManager.h" />
-    <ClInclude Include="Include\CmD3D9VertexDeclaration.h" />
-    <ClInclude Include="Include\CmD3D9VideoMode.h" />
-    <ClInclude Include="Include\CmD3D9VideoModeList.h" />
     <ClInclude Include="Include\CmDefaultHardwareBufferManager.h" />
     <ClInclude Include="Include\CmFrustum.h" />
     <ClInclude Include="Include\CmGpuProgram.h" />
@@ -156,111 +130,11 @@
     <ClInclude Include="Include\CmWindowEventUtilities.h" />
     <ClInclude Include="Include\stdafx.h" />
     <ClInclude Include="Include\targetver.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\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\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\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\win32\CmGLUtil.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="RenderSystemGL\Source\atifs\src\ATI_FS_GLGpuProgram.cpp" />
-    <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\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\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\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\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="Source\CamelotRenderer.cpp" />
     <ClCompile Include="Source\CmApplication.cpp" />
     <ClCompile Include="Source\CmCamera.cpp" />
-    <ClCompile Include="Source\CmD3D9Device.cpp" />
-    <ClCompile Include="Source\CmD3D9DeviceManager.cpp" />
-    <ClCompile Include="Source\CmD3D9Driver.cpp" />
-    <ClCompile Include="Source\CmD3D9DriverList.cpp" />
-    <ClCompile Include="Source\CmD3D9GpuProgram.cpp" />
-    <ClCompile Include="Source\CmD3D9GpuProgramManager.cpp" />
-    <ClCompile Include="Source\CmD3D9HardwareBufferManager.cpp" />
-    <ClCompile Include="Source\CmD3D9HardwareIndexBuffer.cpp" />
-    <ClCompile Include="Source\CmD3D9HardwareOcclusionQuery.cpp" />
-    <ClCompile Include="Source\CmD3D9HardwarePixelBuffer.cpp" />
-    <ClCompile Include="Source\CmD3D9HardwareVertexBuffer.cpp" />
-    <ClCompile Include="Source\CmD3D9HLSLProgram.cpp" />
-    <ClCompile Include="Source\CmD3D9HLSLProgramFactory.cpp" />
-    <ClCompile Include="Source\CmD3D9Mappings.cpp" />
-    <ClCompile Include="Source\CmD3D9MultiRenderTarget.cpp" />
-    <ClCompile Include="Source\CmD3D9RenderSystem.cpp" />
-    <ClCompile Include="Source\CmD3D9RenderSystemFactory.cpp" />
-    <ClCompile Include="Source\CmD3D9RenderWindow.cpp" />
-    <ClCompile Include="Source\CmD3D9Resource.cpp" />
-    <ClCompile Include="Source\CmD3D9ResourceManager.cpp" />
-    <ClCompile Include="Source\CmD3D9Texture.cpp" />
-    <ClCompile Include="Source\CmD3D9TextureManager.cpp" />
-    <ClCompile Include="Source\CmD3D9VertexDeclaration.cpp" />
-    <ClCompile Include="Source\CmD3D9VideoMode.cpp" />
-    <ClCompile Include="Source\CmD3D9VideoModeList.cpp" />
     <ClCompile Include="Source\CmDefaultHardwareBufferManager.cpp" />
     <ClCompile Include="Source\CmFrustum.cpp" />
     <ClCompile Include="Source\CmGpuProgram.cpp" />

CamelotRenderer/CamelotRenderer.vcxproj.filters

@@ -13,12 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\D3D9RenderSystem">
-      <UniqueIdentifier>{e3f1eefd-4271-435c-a2e4-ce6770542e1f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\D3D9RenderSystem">
-      <UniqueIdentifier>{5ab8878b-6adb-4f4a-84c4-9315abf782d2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\ForRemoval">
       <UniqueIdentifier>{f916bd59-03a7-42a7-9b9c-60abe94020bc}</UniqueIdentifier>
     </Filter>
@@ -31,24 +25,6 @@
     <Filter Include="Source Files\Utility">
       <UniqueIdentifier>{48d2fcc6-cfa6-4d2f-a83c-d16ec65eb96b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RenderSystemGL">
-      <UniqueIdentifier>{d4385d3f-7227-4aed-a387-250886e950ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="RenderSystemGL\Header Files">
-      <UniqueIdentifier>{94e160b5-1529-4d29-9ee0-eea8158ec876}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="RenderSystemGL\Source Files">
-      <UniqueIdentifier>{87b73aca-929b-4d9b-897c-1a893a7453b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="RenderSystemGL\ATIFS">
-      <UniqueIdentifier>{3ae65763-62bb-4a7c-831e-369c75f19fc1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="RenderSystemGL\GLSL">
-      <UniqueIdentifier>{bc8cc9fd-f7d3-46f6-9d0d-d0d8dbb080c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="RenderSystemGL\Win32">
-      <UniqueIdentifier>{7c0425d8-c90d-4dce-89f6-11eeafe1efd9}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />
@@ -56,201 +32,6 @@
     <Text Include="HighLevelTODO.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="RenderSystemGL\Source\atifs\include\ATI_FS_GLGpuProgram.h">
-      <Filter>RenderSystemGL\ATIFS</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\atifs\include\Compiler2Pass.h">
-      <Filter>RenderSystemGL\ATIFS</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Source\atifs\include\ps_1_4.h">
-      <Filter>RenderSystemGL\ATIFS</Filter>
-    </ClInclude>
-    <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystemFactory.h">
-      <Filter>RenderSystemGL\Header Files</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\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>
-    <ClInclude Include="Include\CmD3D9Device.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9DeviceManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9Driver.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9DriverList.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9GpuProgram.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9GpuProgramManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HardwareBufferManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HardwareIndexBuffer.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HardwareOcclusionQuery.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HardwarePixelBuffer.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HardwareVertexBuffer.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HLSLProgram.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9HLSLProgramFactory.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9Mappings.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9MultiRenderTarget.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9Prerequisites.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9RenderSystem.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9RenderSystemFactory.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9RenderWindow.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9Resource.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9ResourceManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9Texture.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9TextureManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9VertexDeclaration.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9VideoMode.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmD3D9VideoModeList.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmConfigOptionMap.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
@@ -358,114 +139,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="RenderSystemGL\Source\atifs\src\ATI_FS_GLGpuProgram.cpp">
-      <Filter>RenderSystemGL\ATIFS</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\atifs\src\Compiler2Pass.cpp">
-      <Filter>RenderSystemGL\ATIFS</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\atifs\src\ps_1_4.cpp">
-      <Filter>RenderSystemGL\ATIFS</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\glew.cpp">
-      <Filter>RenderSystemGL\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RenderSystemGL\Source\CmGLRenderSystemFactory.cpp">
-      <Filter>RenderSystemGL\Source Files</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\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>
     <ClCompile Include="Source\CamelotRenderer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -547,81 +220,6 @@
     <ClCompile Include="Source\stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CmD3D9Device.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9DeviceManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9Driver.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9DriverList.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9GpuProgram.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9GpuProgramManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HardwareBufferManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HardwareIndexBuffer.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HardwareOcclusionQuery.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HardwarePixelBuffer.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HardwareVertexBuffer.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HLSLProgram.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9HLSLProgramFactory.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9Mappings.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9MultiRenderTarget.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9RenderSystem.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9RenderSystemFactory.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9RenderWindow.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9Resource.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9ResourceManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9Texture.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9TextureManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9VertexDeclaration.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9VideoMode.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmD3D9VideoModeList.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
     <ClCompile Include="Source\CmWindowEventUtilities.cpp">
       <Filter>Source Files\Utility</Filter>
     </ClCompile>

CamelotRenderer/Include/CmRenderSystemManager.h

@@ -1,17 +1,13 @@
 #pragma once
 
-#include <string>
-#include <vector>
-#include <memory>
-#include <assert.h>
-
+#include "CmPrerequisites.h"
 #include "CmRenderSystemFactory.h"
 
 namespace CamelotEngine
 {
 	typedef std::shared_ptr<RenderSystemFactory> RenderSystemFactoryPtr;
 
-	class RenderSystemManager
+	class CM_EXPORT RenderSystemManager
 	{
 	public:
 		static void initialize(const std::string& name);

CamelotRenderer/Source/CamelotRenderer.cpp

@@ -17,9 +17,6 @@
 #include "CmVector3.h"
 #include "CmVector4.h"
 #include "CmHardwareBuffer.h"
-
-#include "CmD3D9Prerequisites.h"
-#include "CmD3D9VideoMode.h"
 #include "CmRenderSystem.h"
 
 #include "CmApplication.h"

CamelotUtility/CamelotUtility.vcxproj

@@ -49,7 +49,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>Include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CM_STATIC_LIB</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CM_DLL</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -61,7 +61,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>CM_STATIC_LIB</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CM_DLL</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>