Remove unnecessary Src/ folders

Source/Core/VideoCommon/CMakeLists.txt

@@ -1,61 +1,61 @@
-set(SRCS	Src/BPFunctions.cpp
-			Src/BPMemory.cpp
-			Src/BPStructs.cpp
-			Src/CPMemory.cpp
-			Src/CommandProcessor.cpp
-			Src/Debugger.cpp
-			Src/DriverDetails.cpp
-			Src/Fifo.cpp
-			Src/FPSCounter.cpp
-			Src/FramebufferManagerBase.cpp
-			Src/HiresTextures.cpp
-			Src/ImageWrite.cpp
-			Src/IndexGenerator.cpp
-			Src/MainBase.cpp
-			Src/OnScreenDisplay.cpp
-			Src/OpcodeDecoding.cpp
-			Src/PerfQueryBase.cpp
-			Src/PixelEngine.cpp
-			Src/PixelShaderGen.cpp
-			Src/PixelShaderManager.cpp
-			Src/RenderBase.cpp
-			Src/Statistics.cpp
-			Src/TextureCacheBase.cpp
-			Src/TextureConversionShader.cpp
-			Src/VertexLoader.cpp
-			Src/VertexLoaderManager.cpp
-			Src/VertexLoader_Color.cpp
-			Src/VertexLoader_Normal.cpp
-			Src/VertexLoader_Position.cpp
-			Src/VertexLoader_TextCoord.cpp
-			Src/VertexManagerBase.cpp
-			Src/VertexShaderGen.cpp
-			Src/VertexShaderManager.cpp
-			Src/VideoBackendBase.cpp
-			Src/VideoConfig.cpp
-			Src/VideoState.cpp
-			Src/XFMemory.cpp
-			Src/XFStructs.cpp
-			Src/memcpy_amd.cpp)
+set(SRCS	BPFunctions.cpp
+			BPMemory.cpp
+			BPStructs.cpp
+			CPMemory.cpp
+			CommandProcessor.cpp
+			Debugger.cpp
+			DriverDetails.cpp
+			Fifo.cpp
+			FPSCounter.cpp
+			FramebufferManagerBase.cpp
+			HiresTextures.cpp
+			ImageWrite.cpp
+			IndexGenerator.cpp
+			MainBase.cpp
+			OnScreenDisplay.cpp
+			OpcodeDecoding.cpp
+			PerfQueryBase.cpp
+			PixelEngine.cpp
+			PixelShaderGen.cpp
+			PixelShaderManager.cpp
+			RenderBase.cpp
+			Statistics.cpp
+			TextureCacheBase.cpp
+			TextureConversionShader.cpp
+			VertexLoader.cpp
+			VertexLoaderManager.cpp
+			VertexLoader_Color.cpp
+			VertexLoader_Normal.cpp
+			VertexLoader_Position.cpp
+			VertexLoader_TextCoord.cpp
+			VertexManagerBase.cpp
+			VertexShaderGen.cpp
+			VertexShaderManager.cpp
+			VideoBackendBase.cpp
+			VideoConfig.cpp
+			VideoState.cpp
+			XFMemory.cpp
+			XFStructs.cpp
+			memcpy_amd.cpp)
 set(LIBS core png)
 
 if(NOT _M_GENERIC)
-	set(SRCS ${SRCS}	Src/TextureDecoder_x64.cpp
-						Src/DLCache_x64.cpp)
+	set(SRCS ${SRCS}	TextureDecoder_x64.cpp
+						DLCache_x64.cpp)
 else()
-	set(SRCS ${SRCS}	Src/TextureDecoder_Generic.cpp
-						Src/DLCache_Generic.cpp)
+	set(SRCS ${SRCS}	TextureDecoder_Generic.cpp
+						DLCache_Generic.cpp)
 endif()
 if(NOT ${CL} STREQUAL CL-NOTFOUND)
 	list(APPEND LIBS ${CL})
 endif()
 
 if(wxWidgets_FOUND AND WIN32)
-	set(SRCS ${SRCS} Src/EmuWindow.cpp)
+	set(SRCS ${SRCS} EmuWindow.cpp)
 endif()
 
 if(LIBAV_FOUND OR WIN32)
-	set(SRCS ${SRCS} Src/AVIDump.cpp)
+	set(SRCS ${SRCS} AVIDump.cpp)
 endif()
 
 add_dolphin_library(videocommon "${SRCS}" "${LIBS}")

Source/Core/VideoCommon/VideoBackendBase.cpp

@@ -6,12 +6,12 @@
 
 // TODO: ugly
 #ifdef _WIN32
-#include "../../VideoBackends/D3D/Src/VideoBackend.h"
+#include "../VideoBackends/D3D/VideoBackend.h"
 #endif
 #if !defined(USE_GLES) || USE_GLES3
-#include "../../VideoBackends/OGL/Src/VideoBackend.h"
+#include "../VideoBackends/OGL/VideoBackend.h"
 #endif
-#include "../../VideoBackends/Software/Src/VideoBackend.h"
+#include "../VideoBackends/Software/VideoBackend.h"
 
 std::vector<VideoBackend*> g_available_video_backends;
 VideoBackend* g_video_backend = NULL;

Source/Core/VideoCommon/VideoBackendBase.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ChunkFile.h"
-#include "../../VideoCommon/Src/PerfQueryBase.h"
+#include "../VideoCommon/PerfQueryBase.h"
 
 typedef void (*writeFn16)(const u16,const u32);
 typedef void (*writeFn32)(const u32,const u32);

Source/Core/VideoCommon/VideoCommon.vcxproj

@@ -43,103 +43,105 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="Src\AVIDump.cpp" />
-    <ClCompile Include="Src\BPFunctions.cpp" />
-    <ClCompile Include="Src\BPMemory.cpp" />
-    <ClCompile Include="Src\BPStructs.cpp" />
-    <ClCompile Include="Src\CommandProcessor.cpp" />
-    <ClCompile Include="Src\CPMemory.cpp" />
-    <ClCompile Include="Src\Debugger.cpp" />
-    <ClCompile Include="Src\DLCache_x64.cpp" />
-    <ClCompile Include="Src\DriverDetails.cpp" />
-    <ClCompile Include="Src\EmuWindow.cpp" />
-    <ClCompile Include="Src\Fifo.cpp" />
-    <ClCompile Include="Src\FPSCounter.cpp" />
-    <ClCompile Include="Src\FramebufferManagerBase.cpp" />
-    <ClCompile Include="Src\HiresTextures.cpp" />
-    <ClCompile Include="Src\ImageWrite.cpp" />
-    <ClCompile Include="Src\IndexGenerator.cpp" />
-    <ClCompile Include="Src\MainBase.cpp" />
-    <ClCompile Include="Src\memcpy_amd.cpp" />
-    <ClCompile Include="Src\OnScreenDisplay.cpp" />
-    <ClCompile Include="Src\OpcodeDecoding.cpp" />
-    <ClCompile Include="Src\PerfQueryBase.cpp" />
-    <ClCompile Include="Src\PixelEngine.cpp" />
-    <ClCompile Include="Src\PixelShaderGen.cpp" />
-    <ClCompile Include="Src\PixelShaderManager.cpp" />
-    <ClCompile Include="Src\RenderBase.cpp" />
-    <ClCompile Include="Src\Statistics.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="AVIDump.cpp" />
+    <ClCompile Include="BPFunctions.cpp" />
+    <ClCompile Include="BPMemory.cpp" />
+    <ClCompile Include="BPStructs.cpp" />
+    <ClCompile Include="CommandProcessor.cpp" />
+    <ClCompile Include="CPMemory.cpp" />
+    <ClCompile Include="Debugger.cpp" />
+    <ClCompile Include="DriverDetails.cpp" />
+    <ClCompile Include="EmuWindow.cpp" />
+    <ClCompile Include="Fifo.cpp" />
+    <ClCompile Include="FPSCounter.cpp" />
+    <ClCompile Include="FramebufferManagerBase.cpp" />
+    <ClCompile Include="HiresTextures.cpp" />
+    <ClCompile Include="ImageWrite.cpp" />
+    <ClCompile Include="IndexGenerator.cpp" />
+    <ClCompile Include="MainBase.cpp" />
+    <ClCompile Include="memcpy_amd.cpp" />
+    <ClCompile Include="OnScreenDisplay.cpp" />
+    <ClCompile Include="OpcodeDecoding.cpp" />
+    <ClCompile Include="PerfQueryBase.cpp" />
+    <ClCompile Include="PixelEngine.cpp" />
+    <ClCompile Include="PixelShaderGen.cpp" />
+    <ClCompile Include="PixelShaderManager.cpp" />
+    <ClCompile Include="RenderBase.cpp" />
+    <ClCompile Include="Statistics.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\TextureCacheBase.cpp" />
-    <ClCompile Include="Src\TextureConversionShader.cpp" />
-    <ClCompile Include="Src\TextureDecoder_x64.cpp" />
-    <ClCompile Include="Src\VertexLoader.cpp" />
-    <ClCompile Include="Src\VertexLoaderManager.cpp" />
-    <ClCompile Include="Src\VertexLoader_Color.cpp" />
-    <ClCompile Include="Src\VertexLoader_Normal.cpp" />
-    <ClCompile Include="Src\VertexLoader_Position.cpp" />
-    <ClCompile Include="Src\VertexLoader_TextCoord.cpp" />
-    <ClCompile Include="Src\VertexManagerBase.cpp" />
-    <ClCompile Include="Src\VertexShaderGen.cpp" />
-    <ClCompile Include="Src\VertexShaderManager.cpp" />
-    <ClCompile Include="Src\VideoBackendBase.cpp" />
-    <ClCompile Include="Src\VideoConfig.cpp" />
-    <ClCompile Include="Src\VideoState.cpp" />
-    <ClCompile Include="Src\XFMemory.cpp" />
-    <ClCompile Include="Src\XFStructs.cpp" />
+    <ClCompile Include="TextureCacheBase.cpp" />
+    <ClCompile Include="TextureConversionShader.cpp" />
+    <ClCompile Include="VertexLoader.cpp" />
+    <ClCompile Include="VertexLoaderManager.cpp" />
+    <ClCompile Include="VertexLoader_Color.cpp" />
+    <ClCompile Include="VertexLoader_Normal.cpp" />
+    <ClCompile Include="VertexLoader_Position.cpp" />
+    <ClCompile Include="VertexLoader_TextCoord.cpp" />
+    <ClCompile Include="VertexManagerBase.cpp" />
+    <ClCompile Include="VertexShaderGen.cpp" />
+    <ClCompile Include="VertexShaderManager.cpp" />
+    <ClCompile Include="VideoBackendBase.cpp" />
+    <ClCompile Include="VideoConfig.cpp" />
+    <ClCompile Include="VideoState.cpp" />
+    <ClCompile Include="DLCache_x64.cpp" />
+    <ClCompile Include="TextureDecoder_x64.cpp" />
+    <ClCompile Include="XFMemory.cpp" />
+    <ClCompile Include="XFStructs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\AVIDump.h" />
-    <ClInclude Include="Src\BPFunctions.h" />
-    <ClInclude Include="Src\BPMemory.h" />
-    <ClInclude Include="Src\BPStructs.h" />
-    <ClInclude Include="Src\CommandProcessor.h" />
-    <ClInclude Include="Src\CPMemory.h" />
-    <ClInclude Include="Src\DataReader.h" />
-    <ClInclude Include="Src\Debugger.h" />
-    <ClInclude Include="Src\DLCache.h" />
-    <ClInclude Include="Src\DriverDetails.h" />
-    <ClInclude Include="Src\EmuWindow.h" />
-    <ClInclude Include="Src\Fifo.h" />
-    <ClInclude Include="Src\FPSCounter.h" />
-    <ClInclude Include="Src\FramebufferManagerBase.h" />
-    <ClInclude Include="Src\HiresTextures.h" />
-    <ClInclude Include="Src\ImageWrite.h" />
-    <ClInclude Include="Src\IndexGenerator.h" />
-    <ClInclude Include="Src\LightingShaderGen.h" />
-    <ClInclude Include="Src\LookUpTables.h" />
-    <ClInclude Include="Src\MainBase.h" />
-    <ClInclude Include="Src\NativeVertexFormat.h" />
-    <ClInclude Include="Src\OnScreenDisplay.h" />
-    <ClInclude Include="Src\OpcodeDecoding.h" />
-    <ClInclude Include="Src\PerfQueryBase.h" />
-    <ClInclude Include="Src\PixelEngine.h" />
-    <ClInclude Include="Src\PixelShaderGen.h" />
-    <ClInclude Include="Src\PixelShaderManager.h" />
-    <ClInclude Include="Src\RenderBase.h" />
-    <ClInclude Include="Src\ShaderGenCommon.h" />
-    <ClInclude Include="Src\Statistics.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\TextureCacheBase.h" />
-    <ClInclude Include="Src\TextureConversionShader.h" />
-    <ClInclude Include="Src\TextureDecoder.h" />
-    <ClInclude Include="Src\VertexLoader.h" />
-    <ClInclude Include="Src\VertexLoaderManager.h" />
-    <ClInclude Include="Src\VertexLoader_Color.h" />
-    <ClInclude Include="Src\VertexLoader_Normal.h" />
-    <ClInclude Include="Src\VertexLoader_Position.h" />
-    <ClInclude Include="Src\VertexLoader_TextCoord.h" />
-    <ClInclude Include="Src\VertexManagerBase.h" />
-    <ClInclude Include="Src\VertexShaderGen.h" />
-    <ClInclude Include="Src\VertexShaderManager.h" />
-    <ClInclude Include="Src\VideoBackendBase.h" />
-    <ClInclude Include="Src\VideoCommon.h" />
-    <ClInclude Include="Src\VideoConfig.h" />
-    <ClInclude Include="Src\VideoState.h" />
-    <ClInclude Include="Src\XFMemory.h" />
-    <ClInclude Include="Src\XFStructs.h" />
+    <ClInclude Include="AVIDump.h" />
+    <ClInclude Include="BPFunctions.h" />
+    <ClInclude Include="BPMemory.h" />
+    <ClInclude Include="BPStructs.h" />
+    <ClInclude Include="CommandProcessor.h" />
+    <ClInclude Include="CPMemory.h" />
+    <ClInclude Include="DataReader.h" />
+    <ClInclude Include="Debugger.h" />
+    <ClInclude Include="DLCache.h" />
+    <ClInclude Include="DriverDetails.h" />
+    <ClInclude Include="EmuWindow.h" />
+    <ClInclude Include="Fifo.h" />
+    <ClInclude Include="FPSCounter.h" />
+    <ClInclude Include="FramebufferManagerBase.h" />
+    <ClInclude Include="HiresTextures.h" />
+    <ClInclude Include="ImageWrite.h" />
+    <ClInclude Include="IndexGenerator.h" />
+    <ClInclude Include="LightingShaderGen.h" />
+    <ClInclude Include="LookUpTables.h" />
+    <ClInclude Include="MainBase.h" />
+    <ClInclude Include="NativeVertexFormat.h" />
+    <ClInclude Include="OnScreenDisplay.h" />
+    <ClInclude Include="OpcodeDecoding.h" />
+    <ClInclude Include="OpenCL.h" />
+    <ClInclude Include="OpenCL\OCLTextureDecoder.h" />
+    <ClInclude Include="PerfQueryBase.h" />
+    <ClInclude Include="PixelEngine.h" />
+    <ClInclude Include="PixelShaderGen.h" />
+    <ClInclude Include="PixelShaderManager.h" />
+    <ClInclude Include="RenderBase.h" />
+    <ClInclude Include="ShaderGenCommon.h" />
+    <ClInclude Include="Statistics.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="TextureCacheBase.h" />
+    <ClInclude Include="TextureConversionShader.h" />
+    <ClInclude Include="TextureDecoder.h" />
+    <ClInclude Include="VertexLoader.h" />
+    <ClInclude Include="VertexLoaderManager.h" />
+    <ClInclude Include="VertexLoader_Color.h" />
+    <ClInclude Include="VertexLoader_Normal.h" />
+    <ClInclude Include="VertexLoader_Position.h" />
+    <ClInclude Include="VertexLoader_TextCoord.h" />
+    <ClInclude Include="VertexManagerBase.h" />
+    <ClInclude Include="VertexShaderGen.h" />
+    <ClInclude Include="VertexShaderManager.h" />
+    <ClInclude Include="VideoBackendBase.h" />
+    <ClInclude Include="VideoCommon.h" />
+    <ClInclude Include="VideoConfig.h" />
+    <ClInclude Include="VideoState.h" />
+    <ClInclude Include="XFMemory.h" />
+    <ClInclude Include="XFStructs.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/VideoCommon/VideoCommon.vcxproj.filters

@@ -24,257 +24,257 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\CommandProcessor.cpp" />
-    <ClCompile Include="Src\DriverDetails.cpp" />
-    <ClCompile Include="Src\memcpy_amd.cpp" />
-    <ClCompile Include="Src\PixelEngine.cpp" />
-    <ClCompile Include="Src\VideoBackendBase.cpp" />
-    <ClCompile Include="Src\VideoConfig.cpp" />
-    <ClCompile Include="Src\Debugger.cpp">
+    <ClCompile Include="CommandProcessor.cpp" />
+    <ClCompile Include="DriverDetails.cpp" />
+    <ClCompile Include="memcpy_amd.cpp" />
+    <ClCompile Include="PixelEngine.cpp" />
+    <ClCompile Include="VideoBackendBase.cpp" />
+    <ClCompile Include="VideoConfig.cpp" />
+    <ClCompile Include="Debugger.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\EmuWindow.cpp">
+    <ClCompile Include="EmuWindow.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FramebufferManagerBase.cpp">
+    <ClCompile Include="FramebufferManagerBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\MainBase.cpp">
+    <ClCompile Include="MainBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\PerfQueryBase.cpp">
+    <ClCompile Include="PerfQueryBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\RenderBase.cpp">
+    <ClCompile Include="RenderBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\TextureCacheBase.cpp">
+    <ClCompile Include="TextureCacheBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexManagerBase.cpp">
+    <ClCompile Include="VertexManagerBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Fifo.cpp">
+    <ClCompile Include="Fifo.cpp">
       <Filter>Decoding</Filter>
     </ClCompile>
-    <ClCompile Include="Src\OpcodeDecoding.cpp">
+    <ClCompile Include="OpcodeDecoding.cpp">
       <Filter>Decoding</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BPFunctions.cpp">
+    <ClCompile Include="BPFunctions.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BPMemory.cpp">
+    <ClCompile Include="BPMemory.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BPStructs.cpp">
+    <ClCompile Include="BPStructs.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
-    <ClCompile Include="Src\CPMemory.cpp">
+    <ClCompile Include="CPMemory.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
-    <ClCompile Include="Src\XFMemory.cpp">
+    <ClCompile Include="XFMemory.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
-    <ClCompile Include="Src\XFStructs.cpp">
+    <ClCompile Include="XFStructs.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
-    <ClCompile Include="Src\PixelShaderGen.cpp">
+    <ClCompile Include="PixelShaderGen.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
-    <ClCompile Include="Src\TextureConversionShader.cpp">
+    <ClCompile Include="TextureConversionShader.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
-    <ClCompile Include="Src\TextureDecoder_x64.cpp">
-      <Filter>Decoding</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexShaderGen.cpp">
+    <ClCompile Include="TextureDecoder_x64.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
-    <ClCompile Include="Src\PixelShaderManager.cpp">
+    <ClCompile Include="VertexShaderGen.cpp">
+      <Filter>Shader Generators</Filter>
+    </ClCompile>
+    <ClCompile Include="PixelShaderManager.cpp">
       <Filter>Shader Managers</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexShaderManager.cpp">
+    <ClCompile Include="VertexShaderManager.cpp">
       <Filter>Shader Managers</Filter>
     </ClCompile>
-    <ClCompile Include="Src\AVIDump.cpp">
+    <ClCompile Include="AVIDump.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FPSCounter.cpp">
+    <ClCompile Include="FPSCounter.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\HiresTextures.cpp">
+    <ClCompile Include="HiresTextures.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ImageWrite.cpp">
+    <ClCompile Include="ImageWrite.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\IndexGenerator.cpp">
+    <ClCompile Include="IndexGenerator.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\OnScreenDisplay.cpp">
+    <ClCompile Include="OnScreenDisplay.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Statistics.cpp">
+    <ClCompile Include="Statistics.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VideoState.cpp">
+    <ClCompile Include="VideoState.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Src\DLCache_x64.cpp">
+    <ClCompile Include="DLCache_x64.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexLoader.cpp">
+    <ClCompile Include="VertexLoader.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexLoader_Color.cpp">
+    <ClCompile Include="VertexLoader_Color.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexLoader_Normal.cpp">
+    <ClCompile Include="VertexLoader_Normal.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexLoader_Position.cpp">
+    <ClCompile Include="VertexLoader_Position.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexLoader_TextCoord.cpp">
+    <ClCompile Include="VertexLoader_TextCoord.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VertexLoaderManager.cpp">
+    <ClCompile Include="VertexLoaderManager.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\CommandProcessor.h" />
-    <ClInclude Include="Src\DriverDetails.h" />
-    <ClInclude Include="Src\NativeVertexFormat.h" />
-    <ClInclude Include="Src\PixelEngine.h" />
-    <ClInclude Include="Src\VideoBackendBase.h" />
-    <ClInclude Include="Src\VideoCommon.h" />
-    <ClInclude Include="Src\VideoConfig.h" />
-    <ClInclude Include="Src\Debugger.h">
+    <ClInclude Include="CommandProcessor.h" />
+    <ClInclude Include="DriverDetails.h" />
+    <ClInclude Include="NativeVertexFormat.h" />
+    <ClInclude Include="PixelEngine.h" />
+    <ClInclude Include="VideoBackendBase.h" />
+    <ClInclude Include="VideoCommon.h" />
+    <ClInclude Include="VideoConfig.h" />
+    <ClInclude Include="Debugger.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\EmuWindow.h">
+    <ClInclude Include="EmuWindow.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FramebufferManagerBase.h">
+    <ClInclude Include="FramebufferManagerBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\MainBase.h">
+    <ClInclude Include="MainBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PerfQueryBase.h">
+    <ClInclude Include="PerfQueryBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\RenderBase.h">
+    <ClInclude Include="RenderBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\TextureCacheBase.h">
+    <ClInclude Include="TextureCacheBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexManagerBase.h">
+    <ClInclude Include="VertexManagerBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Fifo.h">
+    <ClInclude Include="Fifo.h">
       <Filter>Decoding</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OpcodeDecoding.h">
+    <ClInclude Include="OpcodeDecoding.h">
       <Filter>Decoding</Filter>
     </ClInclude>
-    <ClInclude Include="Src\TextureDecoder.h">
+    <ClInclude Include="TextureDecoder.h">
       <Filter>Decoding</Filter>
     </ClInclude>
-    <ClInclude Include="Src\BPFunctions.h">
+    <ClInclude Include="BPFunctions.h">
       <Filter>Register Sections</Filter>
     </ClInclude>
-    <ClInclude Include="Src\BPMemory.h">
+    <ClInclude Include="BPMemory.h">
       <Filter>Register Sections</Filter>
     </ClInclude>
-    <ClInclude Include="Src\BPStructs.h">
+    <ClInclude Include="BPStructs.h">
       <Filter>Register Sections</Filter>
     </ClInclude>
-    <ClInclude Include="Src\CPMemory.h">
+    <ClInclude Include="CPMemory.h">
       <Filter>Register Sections</Filter>
     </ClInclude>
-    <ClInclude Include="Src\XFMemory.h">
+    <ClInclude Include="XFMemory.h">
       <Filter>Register Sections</Filter>
     </ClInclude>
-    <ClInclude Include="Src\XFStructs.h">
+    <ClInclude Include="XFStructs.h">
       <Filter>Register Sections</Filter>
     </ClInclude>
-    <ClInclude Include="Src\LightingShaderGen.h">
+    <ClInclude Include="LightingShaderGen.h">
       <Filter>Shader Generators</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PixelShaderGen.h">
+    <ClInclude Include="PixelShaderGen.h">
       <Filter>Shader Generators</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ShaderGenCommon.h">
+    <ClInclude Include="ShaderGenCommon.h">
       <Filter>Shader Generators</Filter>
     </ClInclude>
-    <ClInclude Include="Src\TextureConversionShader.h">
+    <ClInclude Include="TextureConversionShader.h">
       <Filter>Shader Generators</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexShaderGen.h">
+    <ClInclude Include="VertexShaderGen.h">
       <Filter>Shader Generators</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PixelShaderManager.h">
+    <ClInclude Include="PixelShaderManager.h">
       <Filter>Shader Managers</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexShaderManager.h">
+    <ClInclude Include="VertexShaderManager.h">
       <Filter>Shader Managers</Filter>
     </ClInclude>
-    <ClInclude Include="Src\AVIDump.h">
+    <ClInclude Include="AVIDump.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FPSCounter.h">
+    <ClInclude Include="FPSCounter.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\HiresTextures.h">
+    <ClInclude Include="HiresTextures.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ImageWrite.h">
+    <ClInclude Include="ImageWrite.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\IndexGenerator.h">
+    <ClInclude Include="IndexGenerator.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\LookUpTables.h">
+    <ClInclude Include="LookUpTables.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OnScreenDisplay.h">
+    <ClInclude Include="OnScreenDisplay.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Statistics.h">
+    <ClInclude Include="Statistics.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VideoState.h">
+    <ClInclude Include="VideoState.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Src\DataReader.h">
+    <ClInclude Include="DataReader.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\DLCache.h">
+    <ClInclude Include="DLCache.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexLoader.h">
+    <ClInclude Include="VertexLoader.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexLoader_Color.h">
+    <ClInclude Include="VertexLoader_Color.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexLoader_Normal.h">
+    <ClInclude Include="VertexLoader_Normal.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexLoader_Position.h">
+    <ClInclude Include="VertexLoader_Position.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexLoader_TextCoord.h">
+    <ClInclude Include="VertexLoader_TextCoord.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VertexLoaderManager.h">
+    <ClInclude Include="VertexLoaderManager.h">
       <Filter>Vertex Loading</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />