From c2ca0852d94b0895355313bcf86420ce520e09fd Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 14 Dec 2021 18:02:10 +1000
Subject: [PATCH] Build: Add pcsx2core variant for Qt

---
 .gitignore                      |    5 +
 CMakeLists.txt                  |    6 +-
 cmake/BuildParameters.cmake     |    6 +
 common/common.vcxproj           |    5 +-
 pcsx2/CMakeLists.txt            |  193 ++-
 pcsx2/pcsx2core.vcxproj         |  800 ++++++++++++
 pcsx2/pcsx2core.vcxproj.filters | 2005 +++++++++++++++++++++++++++++++
 7 files changed, 2970 insertions(+), 50 deletions(-)
 create mode 100644 pcsx2/pcsx2core.vcxproj
 create mode 100644 pcsx2/pcsx2core.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 2e9d923c7e..f5c55caee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,9 +76,13 @@ oprofile_data/
 /bin/PCSX2-linux.sh
 /bin/*ReplayLoader
 /bin/GS*.txt
+/bin/qt.conf
 /bin/bios
 /bin/cache
+/bin/cheats
+/bin/covers
 /bin/dumps
+/bin/gamesettings
 /bin/help
 /bin/inis
 /bin/logs
@@ -86,6 +90,7 @@ oprofile_data/
 /bin/plugins
 /bin/snaps
 /bin/sstates
+/bin/translations
 /deps
 /ipch
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 261c7c59d7..a72a03a32d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ include(SearchForStuff)
 get_git_version_info()
 write_svnrev_h()
 
-if(NOT NO_TRANSLATION)
+if(NOT NO_TRANSLATION AND NOT PCSX2_CORE)
 	# make the translation
 	if(EXISTS "${CMAKE_SOURCE_DIR}/locales")
 		add_subdirectory(locales)
@@ -43,6 +43,10 @@ add_subdirectory(common)
 # make pcsx2
 add_subdirectory(pcsx2)
 
+if (QT_BUILD)
+	add_subdirectory(pcsx2-qt)
+endif()
+
 # tests
 if(ACTUALLY_ENABLE_TESTS)
 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
index bb61086193..30f040fe18 100644
--- a/cmake/BuildParameters.cmake
+++ b/cmake/BuildParameters.cmake
@@ -49,6 +49,7 @@ option(DISABLE_SETCAP "Do not set files capabilities")
 option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
 option(CUBEB_API "Build Cubeb support on SPU2" ON)
 option(GTK2_API "Use GTK2 api (legacy)")
+option(QT_BUILD "Build Qt frontend instead of wx" OFF)
 
 if(UNIX AND NOT APPLE)
 	option(X11_API "Enable X11 support" ON)
@@ -320,6 +321,11 @@ if(CMAKE_BUILD_STRIP)
 	add_link_options(-s)
 endif()
 
+if(QT_BUILD)
+	# We want the core PCSX2 library.
+	set(PCSX2_CORE TRUE)
+endif()
+
 # Enable special stuff for CI builds
 if("$ENV{CI}" STREQUAL "true")
 	list(APPEND PCSX2_DEFS PCSX2_CI)
diff --git a/common/common.vcxproj b/common/common.vcxproj
index 1fec737582..2005697e64 100644
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -209,12 +209,9 @@
     <ProjectReference Include="..\3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj">
       <Project>{3fcc50c2-81e9-5db2-b8d8-2129427568b1}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj">
-      <Project>{6744dad8-9c70-574a-bff2-9f8dddb24a75}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index ef7a206e14..1e66e57fb9 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -3,7 +3,15 @@ include(macros/GlibCompileResourcesSupport)
 # All flags, libraries, etc, that are shared between PCSX2 compilation files
 add_library(PCSX2_FLAGS INTERFACE)
 
-add_executable(PCSX2)
+if (NOT PCSX2_CORE)
+	add_executable(PCSX2)
+else()
+	add_library(PCSX2)
+	target_compile_definitions(PCSX2_FLAGS INTERFACE
+		"PCSX2_CORE"
+		"DISABLE_RECORDING"
+	)
+endif()
 target_link_libraries(PCSX2 PRIVATE PCSX2_FLAGS)
 
 target_compile_features(PCSX2_FLAGS INTERFACE cxx_std_17)
@@ -350,7 +358,6 @@ set(pcsx2DEV9Sources
 	DEV9/PacketReader/IP/IP_Packet.cpp
 	DEV9/PacketReader/EthernetFrame.cpp
 	DEV9/PacketReader/NetLib.cpp
-	DEV9/ConfigUI.cpp
 	DEV9/smap.cpp
 	DEV9/DEV9.cpp
 	DEV9/DEV9Config.cpp
@@ -386,6 +393,12 @@ set(pcsx2DEV9Headers
 	DEV9/smap.h
 	)
 
+if(NOT PCSX2_CORE)
+	list(APPEND pcsx2DEV9Sources
+		DEV9/ConfigUI.cpp
+	)
+endif()
+
 # USBNull
 set(pcsx2USBNullSources USB/USBNull.cpp)
 set(pcsx2USBNullHeaders USB/USB.h)
@@ -474,7 +487,20 @@ if(TARGET PulseAudio::PulseAudio)
 	list(APPEND pcsx2USBHeaders USB/usb-mic/audiodev-pulse.h)
 endif()
 
-if(WIN32)
+if(PCSX2_CORE)
+	# Host PAD
+	set(pcsx2PADSources
+		PAD/Host/KeyStatus.cpp
+		PAD/Host/PAD.cpp
+		PAD/Host/StateManagement.cpp
+	)
+	set(pcsx2PADHeaders
+		PAD/Host/Global.h
+		PAD/Host/KeyStatus.h
+		PAD/Host/PAD.h
+		PAD/Host/StateManagement.h
+	)
+elseif(WIN32)
 	set(pcsx2PADSources
 		PAD/Windows/PADConfig.cpp
 		PAD/Windows/DeviceEnumerator.cpp
@@ -517,7 +543,7 @@ if(WIN32)
 		PAD/Windows/WndProcEater.h
 		PAD/Windows/XInputEnum.h
 	)
-else(WIN32)
+else()
 	# PAD resources pre-compilation
 	set(PADImgHeader "${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/ImgHeader")
 	set(PADImg "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/Img")
@@ -591,7 +617,7 @@ else(WIN32)
 		${PADImgHeader}/arrow_left.h
 		${PADImgHeader}/arrow_right.h
 	)
-endif(WIN32)
+endif()
 
 # GS sources
 set(pcsx2GSSources
@@ -641,7 +667,6 @@ set(pcsx2GSSources
 	GS/Renderers/OpenGL/GSDeviceOGL.cpp
 	GS/Renderers/OpenGL/GSTextureOGL.cpp
 	GS/Window/GSSetting.cpp
-	GS/Window/GSwxDialog.cpp
 	)
 
 # GS headers
@@ -712,7 +737,6 @@ set(pcsx2GSHeaders
 	GS/Window/GSCaptureDlg.h
 	GS/Window/GSDialog.h
 	GS/Window/GSSetting.h
-	GS/Window/GSwxDialog.h
 	)
 
 if(USE_VULKAN)
@@ -726,7 +750,36 @@ if(USE_VULKAN)
 	)
 endif()
 
-if(WIN32)
+if(NOT PCSX2_CORE)
+	list(APPEND pcsx2GSSources
+		GS/Window/GSwxDialog.cpp
+	)
+	list(APPEND pcsx2GSHeaders
+		GS/Window/GSwxDialog.h
+	)
+endif()
+
+if(PCSX2_CORE)
+	list(APPEND pcsx2SPU2Headers
+		SPU2/Host/CfgHelpers.cpp
+		SPU2/Host/Config.cpp
+		SPU2/Host/ConfigDebug.cpp
+		SPU2/Host/ConfigSoundTouch.cpp
+		SPU2/Host/Dialogs.cpp
+	)
+	list(APPEND pcsx2SPU2Headers
+		SPU2/Host/Config.h
+		SPU2/Host/Dialogs.h
+	)
+	if(NOT WIN32)
+		list(APPEND pcsx2SPU2Headers
+			SPU2/WavFile.cpp
+		)
+		list(APPEND pcsx2DEV9Sources
+			DEV9/Linux/Config.cpp
+		)
+	endif()
+elseif(WIN32)
 	list(APPEND pcsx2SPU2Sources
 		SPU2/Windows/CfgHelpers.cpp
 		SPU2/Windows/Config.cpp
@@ -800,7 +853,7 @@ if(WIN32)
 		GS/Renderers/DX11/GSDevice11.h
 		GS/Renderers/DX11/GSTexture11.h
 	)
-else(WIN32)
+else()
 	list(APPEND pcsx2SPU2Sources
 		SPU2/Linux/CfgHelpers.cpp
 		SPU2/Linux/Config.cpp
@@ -853,7 +906,7 @@ else(WIN32)
 		USB/usb-pad/evdev/evdev.h
 		USB/usb-pad/evdev/shared.h
 	)
-endif(WIN32)
+endif()
 
 
 # DebugTools sources
@@ -922,6 +975,26 @@ if(WIN32)
 	)
 endif()
 
+if(PCSX2_CORE)
+	list(APPEND pcsx2FrontendSources
+		Frontend/GameList.cpp
+		Frontend/INISettingsInterface.cpp
+		Frontend/InputManager.cpp
+		Frontend/InputSource.cpp
+		Frontend/LayeredSettingsInterface.cpp
+		HostSettings.cpp
+		VMManager.cpp
+	)
+	list(APPEND pcsx2FrontendHeaders
+		Frontend/GameList.h
+		Frontend/INISettingsInterface.h
+		Frontend/InputManager.h
+		Frontend/InputSource.h
+		Frontend/LayeredSettingsInterface.h
+		HostSettings.h
+		VMManager.h)
+endif()
+
 # gui sources
 set(pcsx2GuiSources
 	gui/AppAssert.cpp
@@ -1090,27 +1163,35 @@ set(pcsx2IPUHeaders
 set(pcsx2LinuxSources
 	CDVD/Linux/DriveUtility.cpp
 	CDVD/Linux/IOCtlSrc.cpp
-	Linux/LnxConsolePipe.cpp
-	Linux/LnxKeyCodes.cpp
 	Linux/LnxFlatFileReader.cpp
 	)
 
 set(pcsx2OSXSources
 	CDVD/Linux/DriveUtility.cpp
 	CDVD/Linux/IOCtlSrc.cpp
-	Linux/LnxConsolePipe.cpp
-#	Linux/LnxKeyCodes.cpp
 	Darwin/DarwinFlatFileReader.cpp
 	)
 
 set(pcsx2FreeBSDSources
 	CDVD/Linux/DriveUtility.cpp
 	CDVD/Linux/IOCtlSrc.cpp
-	Linux/LnxConsolePipe.cpp
-	Linux/LnxKeyCodes.cpp
 	Darwin/DarwinFlatFileReader.cpp
 	)
 
+if(NOT PCSX2_CORE)
+	list(APPEND pcsx2LinuxSources
+		Linux/LnxConsolePipe.cpp
+		Linux/LnxKeyCodes.cpp
+	)
+	list(APPEND pcsx2OSXSources
+		Linux/LnxConsolePipe.cpp
+	)
+	list(APPEND pcsx2FreeBSDSources
+		Linux/LnxConsolePipe.cpp
+		Linux/LnxKeyCodes.cpp
+	)
+endif()
+
 # Linux headers
 set(pcsx2LinuxHeaders
 	)
@@ -1208,8 +1289,12 @@ set(pcsx2RecordingVirtualPadResources
 
 # System sources
 set(pcsx2SystemSources
-	System/SysCoreThread.cpp
 	System/SysThreadBase.cpp)
+if(NOT PCSX2_CORE)
+	list(APPEND pcsx2SystemSources
+		System/SysCoreThread.cpp
+	)
+endif()
 
 # System headers
 set(pcsx2SystemHeaders
@@ -1383,7 +1468,7 @@ if(Linux)
 	)
 endif()
 
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT PCSX2_CORE)
 	if(X11_API)
 		target_link_libraries(PCSX2_FLAGS INTERFACE
 			PkgConfig::X11_XCB
@@ -1413,9 +1498,15 @@ if(UNIX AND NOT Linux)
 		${pcsx2USBNullSources}
 		${pcsx2USBNullHeaders})
 else()
-	target_sources(PCSX2 PRIVATE
-		${pcsx2USBSources}
-		${pcsx2USBHeaders})
+	if(NOT PCSX2_CORE)
+		target_sources(PCSX2 PRIVATE
+			${pcsx2USBSources}
+			${pcsx2USBHeaders})
+	else()
+		target_sources(PCSX2 PRIVATE
+			${pcsx2USBNullSources}
+			${pcsx2USBNullHeaders})
+	endif()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
@@ -1440,6 +1531,12 @@ target_link_libraries(PCSX2_FLAGS INTERFACE
 	${LIBC_LIBRARIES}
 )
 
+if(PCSX2_CORE)
+	target_link_libraries(PCSX2_FLAGS INTERFACE
+		simpleini
+	)
+endif()
+
 if(WIN32)
 	target_link_libraries(PCSX2_FLAGS INTERFACE
 		baseclasses
@@ -1467,8 +1564,12 @@ elseif(APPLE)
 		LibXml2::LibXml2
 	)
 else()
+	if (NOT PCSX2_CORE)
+		target_link_libraries(PCSX2_FLAGS INTERFACE
+			GTK::gtk
+		)
+	endif()
 	target_link_libraries(PCSX2_FLAGS INTERFACE
-		GTK::gtk
 		OpenGL::GL
 		PCAP::PCAP
 		LibXml2::LibXml2
@@ -1476,30 +1577,32 @@ else()
 endif()
 
 ### Generate the resources files
-file(MAKE_DIRECTORY ${res_bin})
+if(NOT PCSX2_CORE)
+	file(MAKE_DIRECTORY ${res_bin})
 
-foreach(res_file IN ITEMS
-		AppIcon16 AppIcon32 AppIcon64 BackgroundLogo Logo NoIcon ButtonIcon_Camera
-		ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard
-		ConfigIcon_Paths ConfigIcon_Speedhacks ConfigIcon_Video Breakpoint_Active Breakpoint_Inactive)
-	add_custom_command(
-		OUTPUT "${res_bin}/${res_file}.h"
-		DEPENDS ${BIN2CPPDEP} "${res_src}/${res_file}.png"
-		COMMAND ${BIN2CPP} "${res_src}/${res_file}.png" "${res_bin}/${res_file}"
-	)
-endforeach()
+	foreach(res_file IN ITEMS
+			AppIcon16 AppIcon32 AppIcon64 BackgroundLogo Logo NoIcon ButtonIcon_Camera
+			ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard
+			ConfigIcon_Paths ConfigIcon_Speedhacks ConfigIcon_Video Breakpoint_Active Breakpoint_Inactive)
+		add_custom_command(
+			OUTPUT "${res_bin}/${res_file}.h"
+			DEPENDS ${BIN2CPPDEP} "${res_src}/${res_file}.png"
+			COMMAND ${BIN2CPP} "${res_src}/${res_file}.png" "${res_bin}/${res_file}"
+		)
+	endforeach()
 
-### Generate Recording resource files
-### Drop them into the folder alongside the png files
-foreach(res_file IN ITEMS
-		circlePressed controllerFull controllerHalf controllerThreeQuarters crossPressed downPressed l1Pressed l2Pressed l3Pressed leftPressed
-		r1Pressed r2Pressed r3Pressed rightPressed selectPressed squarePressed startPressed trianglePressed upPressed)
-	add_custom_command(
-		OUTPUT "${res_rec_vp_src}/${res_file}.h"
-		DEPENDS ${BIN2CPPDEP} "${res_rec_vp_src}/${res_file}.png"
-		COMMAND ${BIN2CPP} "${res_rec_vp_src}/${res_file}.png" "${res_rec_vp_src}/${res_file}"
-	)
-endforeach()
+	### Generate Recording resource files
+	### Drop them into the folder alongside the png files
+	foreach(res_file IN ITEMS
+			circlePressed controllerFull controllerHalf controllerThreeQuarters crossPressed downPressed l1Pressed l2Pressed l3Pressed leftPressed
+			r1Pressed r2Pressed r3Pressed rightPressed selectPressed squarePressed startPressed trianglePressed upPressed)
+		add_custom_command(
+			OUTPUT "${res_rec_vp_src}/${res_file}.h"
+			DEPENDS ${BIN2CPPDEP} "${res_rec_vp_src}/${res_file}.png"
+			COMMAND ${BIN2CPP} "${res_rec_vp_src}/${res_file}.png" "${res_rec_vp_src}/${res_file}"
+		)
+	endforeach()
+endif()
 
 # additonal include directories
 target_include_directories(PCSX2_FLAGS INTERFACE
@@ -1584,7 +1687,7 @@ if (APPLE)
 	endforeach()
 endif()
 
-if(NOT DISABLE_SETCAP)
+if(NOT DISABLE_SETCAP AND NOT PCSX2_CORE)
 	if(PACKAGE_MODE)
 		install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_INSTALL_FULL_BINDIR}/pcsx2' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_INSTALL_FULL_BINDIR}/pcsx2'; set +x\")")
 	else()
diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj
new file mode 100644
index 0000000000..24f0372e36
--- /dev/null
+++ b/pcsx2/pcsx2core.vcxproj
@@ -0,0 +1,800 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
+  <Import Project="$(SolutionDir)common\vsprops\ProjectConfigAVX2.props" />
+  <Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6C7986C4-3E4D-4DCC-B3C6-6BB12B238995}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization Condition="$(Configuration.Contains(Release))">true</WholeProgramOptimization>
+    <UseDebugLibraries Condition="$(Configuration.Contains(Debug))">true</UseDebugLibraries>
+    <UseDebugLibraries Condition="!$(Configuration.Contains(Debug))">false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(SolutionDir)common\vsprops\common.props" />
+    <Import Project="$(SolutionDir)common\vsprops\BaseProperties.props" />
+    <Import Project="$(SolutionDir)common\vsprops\3rdpartyDeps.props" />
+    <Import Project="$(SolutionDir)common\vsprops\pthreads.props" />
+    <Import Condition="$(Configuration.Contains(Debug))" Project="$(SolutionDir)common\vsprops\CodeGen_Debug.props" />
+    <Import Condition="$(Configuration.Contains(Devel))" Project="$(SolutionDir)common\vsprops\CodeGen_Devel.props" />
+    <Import Condition="$(Configuration.Contains(Release))" Project="$(SolutionDir)common\vsprops\CodeGen_Release.props" />
+    <Import Condition="!$(Configuration.Contains(Release))" Project="$(SolutionDir)common\vsprops\IncrementalLinking.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TargetName>pcsx2core</TargetName>
+    <IntDir>$(ProjectDir)pcsx2core\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)pcsx2core\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\baseclasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\glad\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\cubeb\cubeb\include;$(SolutionDir)3rdparty\cubeb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\imgui\imgui;$(SolutionDir)3rdparty\imgui\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\simpleini\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
+      <ForcedIncludeFiles>PrecompiledHeader.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <AdditionalOptions>/Zc:externConstexpr %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;LZMA_API_STATIC;BUILD_DX=1;ENABLE_VULKAN;SPU2X_CUBEB;PCSX2_CORE;DISABLE_RECORDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Configuration.Contains(Debug))">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Configuration.Contains(Devel))">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Configuration.Contains(Release))">NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(CI)'=='true'">PCSX2_CI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="!$(Configuration.Contains(AVX2))">_M_SSE=0x401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Configuration.Contains(AVX2))">_M_SSE=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!-- This flag will throw a warning on x64 as SSE2 is implied-->
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'!='x64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="$(Configuration.Contains(AVX2))">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
+      <!-- SH 2/3 flashlight, explicitly set here don't change -->
+      <!-- https://github.com/PCSX2/pcsx2/commit/16431653e4d92fda4069031897e24fbe4688d36a -->
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <Link>
+      <LargeAddressAware>Yes</LargeAddressAware>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dxguid.lib;dinput8.lib;hid.lib;PowrProf.lib;d3dcompiler.lib;d3d11.lib;dxgi.lib;strmiids.lib;opengl32.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\bin\resources\shaders\vulkan\convert.glsl" />
+    <None Include="..\bin\resources\shaders\vulkan\interlace.glsl" />
+    <None Include="..\bin\resources\shaders\vulkan\merge.glsl" />
+    <None Include="..\bin\resources\shaders\vulkan\tfx.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\common_header.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\convert.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\interlace.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\merge.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\shadeboost.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\tfx_fs.glsl" />
+    <None Include="..\bin\resources\shaders\opengl\tfx_vgs.glsl" />
+    <None Include="..\bin\resources\shaders\dx11\convert.fx" />
+    <None Include="..\bin\resources\shaders\common\fxaa.fx" />
+    <None Include="..\bin\resources\shaders\dx11\interlace.fx" />
+    <None Include="..\bin\resources\shaders\dx11\merge.fx" />
+    <None Include="..\bin\resources\shaders\dx11\shadeboost.fx" />
+    <None Include="..\bin\resources\shaders\dx11\tfx.fx" />
+    <None Include="Utilities\folderdesc.txt" />
+    <None Include="Docs\License.txt" />
+    <None Include="ps2\eeHwTraceLog.inl" />
+    <None Include="x86\microVU_Alloc.inl" />
+    <None Include="x86\microVU_Analyze.inl" />
+    <None Include="x86\microVU_Branch.inl" />
+    <None Include="x86\microVU_Clamp.inl" />
+    <None Include="x86\microVU_Compile.inl" />
+    <None Include="x86\microVU_Execute.inl" />
+    <None Include="x86\microVU_Flags.inl" />
+    <None Include="x86\microVU_Log.inl" />
+    <None Include="x86\microVU_Lower.inl" />
+    <None Include="x86\microVU_Macro.inl" />
+    <None Include="x86\microVU_Misc.inl" />
+    <None Include="x86\microVU_Tables.inl" />
+    <None Include="x86\microVU_Upper.inl" />
+    <!-- Generate Recording GUI Image Headers -->
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CDVD\BlockdumpFileReader.cpp" />
+    <ClCompile Include="CDVD\CDVDdiscReader.cpp" />
+    <ClCompile Include="CDVD\CDVDdiscThread.cpp" />
+    <ClCompile Include="CDVD\ChdFileReader.cpp" />
+    <ClCompile Include="CDVD\ChunksCache.cpp" />
+    <ClCompile Include="CDVD\CompressedFileReader.cpp" />
+    <ClCompile Include="CDVD\CsoFileReader.cpp" />
+    <ClCompile Include="CDVD\GzippedFileReader.cpp" />
+    <ClCompile Include="CDVD\OutputIsoFile.cpp" />
+    <ClCompile Include="CDVD\ThreadedFileReader.cpp" />
+    <ClCompile Include="CDVD\Linux\DriveUtility.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="CDVD\Linux\IOCtlSrc.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="CDVD\Windows\DriveUtility.cpp" />
+    <ClCompile Include="CDVD\Windows\IOCtlSrc.cpp" />
+    <ClCompile Include="DebugTools\Breakpoints.cpp" />
+    <ClCompile Include="DebugTools\DebugInterface.cpp" />
+    <ClCompile Include="DebugTools\DisassemblyManager.cpp" />
+    <ClCompile Include="DebugTools\BiosDebugData.cpp" />
+    <ClCompile Include="DebugTools\ExpressionParser.cpp" />
+    <ClCompile Include="DebugTools\MIPSAnalyst.cpp" />
+    <ClCompile Include="DebugTools\MipsAssembler.cpp" />
+    <ClCompile Include="DebugTools\MipsAssemblerTables.cpp" />
+    <ClCompile Include="DebugTools\MipsStackWalk.cpp" />
+    <ClCompile Include="DebugTools\SymbolMap.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_Command.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdDMA.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdExecuteDeviceDiag.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdNoData.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdPIOData.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdSMART.cpp" />
+    <ClCompile Include="DEV9\ATA\Commands\ATA_SCE.cpp" />
+    <ClCompile Include="DEV9\ATA\ATA_Info.cpp" />
+    <ClCompile Include="DEV9\ATA\ATA_State.cpp" />
+    <ClCompile Include="DEV9\ATA\ATA_Transfer.cpp" />
+    <ClCompile Include="DEV9\ATA\HddCreate.cpp" />
+    <ClCompile Include="DEV9\DEV9Config.cpp" />
+    <ClCompile Include="DEV9\DEV9.cpp" />
+    <ClCompile Include="DEV9\flash.cpp" />
+    <ClCompile Include="DEV9\InternalServers\DHCP_Server.cpp" />
+    <ClCompile Include="DEV9\InternalServers\DNS_Logger.cpp" />
+    <ClCompile Include="DEV9\InternalServers\DNS_Server.cpp" />
+    <ClCompile Include="DEV9\PacketReader\EthernetFrame.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Options.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Packet.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Classes.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Packet.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\UDP_Packet.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\IP_Options.cpp" />
+    <ClCompile Include="DEV9\PacketReader\IP\IP_Packet.cpp" />
+    <ClCompile Include="DEV9\PacketReader\NetLib.cpp" />
+    <ClCompile Include="DEV9\pcap_io.cpp" />
+    <ClCompile Include="DEV9\Win32\pcap_io_win32.cpp" />
+    <ClCompile Include="DEV9\smap.cpp" />
+    <ClCompile Include="DEV9\Win32\DEV9WinConfig.cpp" />
+    <ClCompile Include="DEV9\net.cpp" />
+    <ClCompile Include="DEV9\Win32\tap-win32.cpp" />
+    <ClCompile Include="Frontend\D3D11HostDisplay.cpp" />
+    <ClCompile Include="Frontend\GameList.cpp" />
+    <ClCompile Include="Frontend\ImGuiManager.cpp" />
+    <ClCompile Include="Frontend\imgui_impl_vulkan.cpp" />
+    <ClCompile Include="Frontend\INISettingsInterface.cpp" />
+    <ClCompile Include="Frontend\InputManager.cpp" />
+    <ClCompile Include="Frontend\InputSource.cpp" />
+    <ClCompile Include="Frontend\LayeredSettingsInterface.cpp" />
+    <ClCompile Include="Frontend\OpenGLHostDisplay.cpp" />
+    <ClCompile Include="Frontend\SDLInputSource.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug AVX2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel AVX2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release AVX2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug AVX2|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel AVX2|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release AVX2|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Frontend\VulkanHostDisplay.cpp" />
+    <ClCompile Include="Frontend\XInputSource.cpp" />
+    <ClCompile Include="GameDatabase.cpp" />
+    <ClCompile Include="Gif_Logger.cpp" />
+    <ClCompile Include="Gif_Unit.cpp" />
+    <ClCompile Include="GS\Renderers\DX11\D3D.cpp" />
+    <ClCompile Include="GS\Window\GSwxDialog.cpp" />
+    <ClCompile Include="GS\Renderers\Vulkan\GSDeviceVK.cpp" />
+    <ClCompile Include="GS\Renderers\Vulkan\GSTextureVK.cpp" />
+    <ClCompile Include="Host.cpp" />
+    <ClCompile Include="HostDisplay.cpp" />
+    <ClCompile Include="HostSettings.cpp" />
+    <ClCompile Include="IopGte.cpp" />
+    <ClCompile Include="PAD\Host\KeyStatus.cpp" />
+    <ClCompile Include="PAD\Host\PAD.cpp" />
+    <ClCompile Include="PAD\Host\StateManagement.cpp" />
+    <ClCompile Include="PINE.cpp" />
+    <ClCompile Include="FW.cpp" />
+    <ClCompile Include="MemoryCardFile.cpp" />
+    <ClCompile Include="MemoryCardFolder.cpp" />
+    <ClCompile Include="PerformanceMetrics.cpp" />
+    <ClCompile Include="SPU2\DplIIdecoder.cpp" />
+    <ClCompile Include="SPU2\debug.cpp" />
+    <ClCompile Include="SPU2\Host\CfgHelpers.cpp" />
+    <ClCompile Include="SPU2\Host\Config.cpp" />
+    <ClCompile Include="SPU2\Host\ConfigDebug.cpp" />
+    <ClCompile Include="SPU2\Host\ConfigSoundTouch.cpp" />
+    <ClCompile Include="SPU2\Host\Dialogs.cpp" />
+    <ClCompile Include="SPU2\RegLog.cpp" />
+    <ClCompile Include="SPU2\SndOut_Cubeb.cpp" />
+    <ClCompile Include="SPU2\wavedump_wav.cpp" />
+    <ClCompile Include="SPU2\SndOut.cpp" />
+    <ClCompile Include="SPU2\Timestretcher.cpp" />
+    <ClCompile Include="SPU2\dma.cpp" />
+    <ClCompile Include="SPU2\RegTable.cpp" />
+    <ClCompile Include="SPU2\spu2freeze.cpp" />
+    <ClCompile Include="SPU2\spu2sys.cpp" />
+    <ClCompile Include="SPU2\ADSR.cpp" />
+    <ClCompile Include="SPU2\Mixer.cpp" />
+    <ClCompile Include="SPU2\ReadInput.cpp" />
+    <ClCompile Include="SPU2\Reverb.cpp" />
+    <ClCompile Include="SPU2\spu2.cpp" />
+    <ClCompile Include="IPU\IPUdma.cpp" />
+    <ClCompile Include="IPU\IPUdither.cpp" />
+    <ClCompile Include="Mdec.cpp" />
+    <ClCompile Include="MultipartFileReader.cpp" />
+    <ClCompile Include="Patch.cpp" />
+    <ClCompile Include="Patch_Memory.cpp" />
+    <ClCompile Include="PrecompiledHeader.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ps2\Iop\PsxBios.cpp" />
+    <ClCompile Include="ps2\LegacyDmac.cpp" />
+    <ClCompile Include="ps2\pgif.cpp" />
+    <ClCompile Include="ShiftJisToUnicode.cpp" />
+    <ClCompile Include="sif2.cpp" />
+    <ClCompile Include="GS\Renderers\OpenGL\GLLoader.cpp" />
+    <ClCompile Include="GS\Renderers\OpenGL\GLState.cpp" />
+    <ClCompile Include="GS\GS.cpp" />
+    <ClCompile Include="GS\GSAlignedClass.cpp" />
+    <ClCompile Include="GS\GSBlock.cpp" />
+    <ClCompile Include="GS\GSCapture.cpp" />
+    <ClCompile Include="GS\Window\GSCaptureDlg.cpp" />
+    <ClCompile Include="GS\GSClut.cpp" />
+    <ClCompile Include="GS\GSCodeBuffer.cpp" />
+    <ClCompile Include="GS\GSCrc.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSDevice.cpp" />
+    <ClCompile Include="GS\Renderers\DX11\GSDevice11.cpp" />
+    <ClCompile Include="GS\Renderers\Null\GSDeviceNull.cpp" />
+    <ClCompile Include="GS\Renderers\OpenGL\GSDeviceOGL.cpp" />
+    <ClCompile Include="GS\Window\GSDialog.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSDirtyRect.cpp" />
+    <ClCompile Include="GS\GSDrawingContext.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSDrawScanline.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.all.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSNewCodeGenerator.cpp" />
+    <ClCompile Include="GS\GSDump.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSFunctionMap.cpp" />
+    <ClCompile Include="GS\Renderers\HW\GSHwHack.cpp" />
+    <ClCompile Include="GS\GSLocalMemory.cpp" />
+    <ClCompile Include="GS\GSLzma.cpp" />
+    <ClCompile Include="GS\GSPerfMon.cpp" />
+    <ClCompile Include="GS\GSPng.cpp" />
+    <ClCompile Include="GS\GSRingHeap.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSRasterizer.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSRenderer.cpp" />
+    <ClCompile Include="GS\Renderers\HW\GSRendererHW.cpp" />
+    <ClCompile Include="GS\Renderers\HW\GSRendererNew.cpp" />
+    <ClCompile Include="GS\Renderers\Null\GSRendererNull.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSRendererSW.cpp" />
+    <ClCompile Include="GS\Window\GSSetting.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.all.cpp" />
+    <ClCompile Include="GS\GSState.cpp" />
+    <ClCompile Include="GS\GSTables.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSTexture.cpp" />
+    <ClCompile Include="GS\Renderers\DX11\GSTexture11.cpp" />
+    <ClCompile Include="GS\Renderers\OpenGL\GSTextureOGL.cpp" />
+    <ClCompile Include="GS\Renderers\HW\GSTextureCache.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSTextureCacheSW.cpp" />
+    <ClCompile Include="GS\Renderers\DX11\GSTextureFX11.cpp" />
+    <ClCompile Include="GS\Renderers\Null\GSTextureNull.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSTextureSW.cpp" />
+    <ClCompile Include="GS\GSUtil.cpp" />
+    <ClCompile Include="GS\GSVector.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSVertexList.cpp" />
+    <ClCompile Include="GS\Renderers\SW\GSVertexSW.cpp" />
+    <ClCompile Include="GS\Renderers\Common\GSVertexTrace.cpp" />
+    <ClCompile Include="SPU2\Windows\SndOut_XAudio2.cpp" />
+    <ClCompile Include="USB\USBNull.cpp" />
+    <ClCompile Include="Utilities\FileUtils.cpp" />
+    <ClCompile Include="Dump.cpp" />
+    <ClCompile Include="VMManager.cpp" />
+    <ClCompile Include="windows\Optimus.cpp" />
+    <ClCompile Include="windows\WinCompressNTFS.cpp" />
+    <ClCompile Include="x86\iMisc.cpp" />
+    <ClCompile Include="Pcsx2Config.cpp" />
+    <ClCompile Include="windows\FlatFileReaderWindows.cpp" />
+    <ClCompile Include="Darwin\DarwinFlatFileReader.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="SaveState.cpp" />
+    <ClCompile Include="SourceLog.cpp" />
+    <ClCompile Include="System.cpp" />
+    <ClCompile Include="System\SysThreadBase.cpp" />
+    <ClCompile Include="Elfheader.cpp" />
+    <ClCompile Include="CDVD\InputIsoFile.cpp" />
+    <ClCompile Include="x86\BaseblockEx.cpp" />
+    <ClCompile Include="ps2\BiosTools.cpp" />
+    <ClCompile Include="Counters.cpp" />
+    <ClCompile Include="FiFo.cpp" />
+    <ClCompile Include="Hw.cpp" />
+    <ClCompile Include="HwRead.cpp" />
+    <ClCompile Include="HwWrite.cpp" />
+    <ClCompile Include="Cache.cpp" />
+    <ClCompile Include="Memory.cpp" />
+    <ClCompile Include="x86\ix86-32\recVTLB.cpp" />
+    <ClCompile Include="vtlb.cpp" />
+    <ClCompile Include="MTVU.cpp" />
+    <ClCompile Include="VUmicro.cpp" />
+    <ClCompile Include="VUmicroMem.cpp" />
+    <ClCompile Include="x86\microVU.cpp" />
+    <ClCompile Include="VU0.cpp" />
+    <ClCompile Include="VU0micro.cpp" />
+    <ClCompile Include="VU0microInterp.cpp" />
+    <ClCompile Include="VU1micro.cpp" />
+    <ClCompile Include="VU1microInterp.cpp" />
+    <ClCompile Include="VUflags.cpp" />
+    <ClCompile Include="VUops.cpp" />
+    <ClCompile Include="Sif.cpp" />
+    <ClCompile Include="Sif0.cpp" />
+    <ClCompile Include="Sif1.cpp" />
+    <ClCompile Include="Vif.cpp" />
+    <ClCompile Include="Vif0_Dma.cpp" />
+    <ClCompile Include="Vif1_Dma.cpp" />
+    <ClCompile Include="Vif1_MFIFO.cpp" />
+    <ClCompile Include="Vif_Codes.cpp" />
+    <ClCompile Include="Vif_Transfer.cpp" />
+    <ClCompile Include="Vif_Unpack.cpp" />
+    <ClCompile Include="x86\newVif_Unpack.cpp" />
+    <ClCompile Include="x86\newVif_Dynarec.cpp" />
+    <ClCompile Include="x86\newVif_UnpackSSE.cpp" />
+    <ClCompile Include="SPR.cpp" />
+    <ClCompile Include="Gif.cpp" />
+    <ClCompile Include="R5900OpcodeTables.cpp" />
+    <ClCompile Include="x86\iCOP0.cpp" />
+    <ClCompile Include="x86\iFPU.cpp" />
+    <ClCompile Include="x86\iFPUd.cpp" />
+    <ClCompile Include="x86\iMMI.cpp" />
+    <ClCompile Include="x86\iR5900Misc.cpp" />
+    <ClCompile Include="x86\ir5900tables.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900-32.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900Arit.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900AritImm.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900Branch.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900Jump.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900LoadStore.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900Move.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900MultDiv.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900Shift.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900Templates.cpp" />
+    <ClCompile Include="COP0.cpp" />
+    <ClCompile Include="COP2.cpp" />
+    <ClCompile Include="FPU.cpp" />
+    <ClCompile Include="Interpreter.cpp" />
+    <ClCompile Include="MMI.cpp" />
+    <ClCompile Include="R5900.cpp" />
+    <ClCompile Include="R5900OpcodeImpl.cpp" />
+    <ClCompile Include="IopBios.cpp" />
+    <ClCompile Include="IopCounters.cpp" />
+    <ClCompile Include="IopDma.cpp" />
+    <ClCompile Include="IopIrq.cpp" />
+    <ClCompile Include="IopMem.cpp" />
+    <ClCompile Include="IopSio2.cpp" />
+    <ClCompile Include="R3000A.cpp" />
+    <ClCompile Include="R3000AInterpreter.cpp" />
+    <ClCompile Include="R3000AOpcodeTables.cpp" />
+    <ClCompile Include="Sio.cpp" />
+    <ClCompile Include="x86\iR3000A.cpp" />
+    <ClCompile Include="x86\iR3000Atables.cpp" />
+    <ClCompile Include="IopHw.cpp" />
+    <ClCompile Include="ps2\Iop\IopHwRead.cpp" />
+    <ClCompile Include="ps2\Iop\IopHwWrite.cpp" />
+    <ClCompile Include="CDVD\CdRom.cpp" />
+    <ClCompile Include="CDVD\CDVD.cpp" />
+    <ClCompile Include="CDVD\CDVDaccess.cpp" />
+    <ClCompile Include="CDVD\CDVDisoReader.cpp" />
+    <ClCompile Include="Ipu\IPU.cpp" />
+    <ClCompile Include="Ipu\IPU_Fifo.cpp" />
+    <ClCompile Include="Ipu\yuv2rgb.cpp" />
+    <ClCompile Include="Ipu\mpeg2lib\Idct.cpp" />
+    <ClCompile Include="Ipu\mpeg2lib\Mpeg.cpp" />
+    <ClCompile Include="GS.cpp" />
+    <ClCompile Include="GSState.cpp" />
+    <ClCompile Include="MTGS.cpp" />
+    <ClCompile Include="DebugTools\DisR3000A.cpp" />
+    <ClCompile Include="DebugTools\DisR5900asm.cpp" />
+    <ClCompile Include="DebugTools\DisVU0Micro.cpp" />
+    <ClCompile Include="DebugTools\DisVU1Micro.cpp" />
+    <ClCompile Include="rdebug\deci2.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_dbgp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_dcmp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_iloadp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_netmp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_ttyp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iCore-32.cpp" />
+    <ClCompile Include="x86\iCore.cpp" />
+    <ClCompile Include="CDVD\IsoFS\IsoFile.cpp" />
+    <ClCompile Include="CDVD\IsoFS\IsoFS.cpp" />
+    <ClCompile Include="CDVD\IsoFS\IsoFSCDVD.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AsyncFileReader.h" />
+    <ClInclude Include="CDVD\CDVDdiscReader.h" />
+    <ClInclude Include="CDVD\ChunksCache.h" />
+    <ClInclude Include="CDVD\CompressedFileReader.h" />
+    <ClInclude Include="CDVD\CompressedFileReaderUtils.h" />
+    <ClInclude Include="CDVD\CsoFileReader.h" />
+    <ClInclude Include="CDVD\ChdFileReader.h" />
+    <ClInclude Include="CDVD\GzippedFileReader.h" />
+    <ClInclude Include="CDVD\ThreadedFileReader.h" />
+    <ClInclude Include="CDVD\zlib_indexed.h" />
+    <ClInclude Include="DebugTools\Breakpoints.h" />
+    <ClInclude Include="DebugTools\DebugInterface.h" />
+    <ClInclude Include="DebugTools\DisassemblyManager.h" />
+    <ClInclude Include="DebugTools\BiosDebugData.h" />
+    <ClInclude Include="DebugTools\ExpressionParser.h" />
+    <ClInclude Include="DebugTools\MIPSAnalyst.h" />
+    <ClInclude Include="DebugTools\MipsAssembler.h" />
+    <ClInclude Include="DebugTools\MipsAssemblerTables.h" />
+    <ClInclude Include="DebugTools\MipsStackWalk.h" />
+    <ClInclude Include="DebugTools\SymbolMap.h" />
+    <ClInclude Include="DEV9\ATA\ATA.h" />
+    <ClInclude Include="DEV9\ATA\HddCreate.h" />
+    <ClInclude Include="DEV9\Config.h" />
+    <ClInclude Include="DEV9\DEV9.h" />
+    <ClInclude Include="DEV9\InternalServers\DHCP_Server.h" />
+    <ClInclude Include="DEV9\InternalServers\DNS_Logger.h" />
+    <ClInclude Include="DEV9\InternalServers\DNS_Server.h" />
+    <ClInclude Include="DEV9\net.h" />
+    <ClInclude Include="DEV9\PacketReader\EthernetFrame.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Options.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Packet.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Classes.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Enums.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Packet.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\UDP_Packet.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Address.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Options.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Packet.h" />
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Payload.h" />
+    <ClInclude Include="DEV9\PacketReader\NetLib.h" />
+    <ClInclude Include="DEV9\PacketReader\Payload.h" />
+    <ClInclude Include="DEV9\pcap_io.h" />
+    <ClInclude Include="DEV9\SimpleQueue.h" />
+    <ClInclude Include="DEV9\smap.h" />
+    <ClInclude Include="DEV9\Win32\pcap_io_win32_funcs.h" />
+    <ClInclude Include="DEV9\Win32\tap.h" />
+    <ClInclude Include="Frontend\D3D11HostDisplay.h" />
+    <ClInclude Include="Frontend\GameList.h" />
+    <ClInclude Include="Frontend\ImGuiManager.h" />
+    <ClInclude Include="Frontend\INISettingsInterface.h" />
+    <ClInclude Include="Frontend\InputManager.h" />
+    <ClInclude Include="Frontend\InputSource.h" />
+    <ClInclude Include="Frontend\LayeredSettingsInterface.h" />
+    <ClInclude Include="Frontend\OpenGLHostDisplay.h" />
+    <ClInclude Include="Frontend\SDLInputSource.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug AVX2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel AVX2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release AVX2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug AVX2|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel AVX2|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release AVX2|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Frontend\VulkanHostDisplay.h" />
+    <ClInclude Include="Frontend\XInputSource.h" />
+    <ClInclude Include="GameDatabase.h" />
+    <ClInclude Include="Gif_Unit.h" />
+    <ClInclude Include="GS\Renderers\DX11\D3D.h" />
+    <ClInclude Include="GS\Window\GSwxDialog.h" />
+    <ClInclude Include="GS\Renderers\Vulkan\GSDeviceVK.h" />
+    <ClInclude Include="GS\Renderers\Vulkan\GSTextureVK.h" />
+    <ClInclude Include="Host.h" />
+    <ClInclude Include="HostDisplay.h" />
+    <ClInclude Include="HostSettings.h" />
+    <ClInclude Include="IopGte.h" />
+    <ClInclude Include="PAD\Gamepad.h" />
+    <ClInclude Include="PAD\Host\Global.h" />
+    <ClInclude Include="PAD\Host\KeyStatus.h" />
+    <ClInclude Include="PAD\Host\PAD.h" />
+    <ClInclude Include="PAD\Host\StateManagement.h" />
+    <ClInclude Include="PINE.h" />
+    <ClInclude Include="FW.h" />
+    <ClInclude Include="MemoryCardFile.h" />
+    <ClInclude Include="MemoryCardFolder.h" />
+    <ClInclude Include="PerformanceMetrics.h" />
+    <ClInclude Include="SPU2\Config.h" />
+    <ClInclude Include="SPU2\Global.h" />
+    <ClInclude Include="SPU2\Host\Config.h" />
+    <ClInclude Include="SPU2\Host\Dialogs.h" />
+    <ClInclude Include="SPU2\interpolate_table.h" />
+    <ClInclude Include="SPU2\SndOut.h" />
+    <ClInclude Include="SPU2\spdif.h" />
+    <ClInclude Include="SPU2\defs.h" />
+    <ClInclude Include="SPU2\Dma.h" />
+    <ClInclude Include="SPU2\regs.h" />
+    <ClInclude Include="SPU2\Mixer.h" />
+    <ClInclude Include="SPU2\spu2.h" />
+    <ClInclude Include="GS\config.h" />
+    <ClInclude Include="GS\Renderers\OpenGL\GLLoader.h" />
+    <ClInclude Include="GS\Renderers\OpenGL\GLState.h" />
+    <ClInclude Include="GS\GS.h" />
+    <ClInclude Include="GS\GSExtra.h" />
+    <ClInclude Include="GS\GSGL.h" />
+    <ClInclude Include="GS\GSIntrin.h" />
+    <ClInclude Include="GS\GSRegs.h" />
+    <ClInclude Include="GS\GSAlignedClass.h" />
+    <ClInclude Include="GS\GSBlock.h" />
+    <ClInclude Include="GS\GSCapture.h" />
+    <ClInclude Include="GS\Window\GSCaptureDlg.h" />
+    <ClInclude Include="GS\GSClut.h" />
+    <ClInclude Include="GS\GSCodeBuffer.h" />
+    <ClInclude Include="GS\GSCrc.h" />
+    <ClInclude Include="GS\Renderers\Common\GSDevice.h" />
+    <ClInclude Include="GS\Renderers\DX11\GSDevice11.h" />
+    <ClInclude Include="GS\Renderers\Null\GSDeviceNull.h" />
+    <ClInclude Include="GS\Renderers\OpenGL\GSDeviceOGL.h" />
+    <ClInclude Include="GS\Window\GSDialog.h" />
+    <ClInclude Include="GS\Renderers\Common\GSDirtyRect.h" />
+    <ClInclude Include="GS\GSDrawingContext.h" />
+    <ClInclude Include="GS\GSDrawingEnvironment.h" />
+    <ClInclude Include="GS\Renderers\SW\GSDrawScanline.h" />
+    <ClInclude Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.h" />
+    <ClInclude Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.all.h" />
+    <ClInclude Include="GS\Renderers\SW\GSNewCodeGenerator.h" />
+    <ClInclude Include="GS\GSDump.h" />
+    <ClInclude Include="GS\Renderers\Common\GSFastList.h" />
+    <ClInclude Include="GS\Renderers\Common\GSFunctionMap.h" />
+    <ClInclude Include="GS\GSLocalMemory.h" />
+    <ClInclude Include="GS\GSLzma.h" />
+    <ClInclude Include="GS\GSPerfMon.h" />
+    <ClInclude Include="GS\GSPng.h" />
+    <ClInclude Include="GS\GSRingHeap.h" />
+    <ClInclude Include="GS\Renderers\SW\GSRasterizer.h" />
+    <ClInclude Include="GS\Renderers\Common\GSRenderer.h" />
+    <ClInclude Include="GS\Renderers\HW\GSRendererHW.h" />
+    <ClInclude Include="GS\Renderers\HW\GSRendererNew.h" />
+    <ClInclude Include="GS\Renderers\Null\GSRendererNull.h" />
+    <ClInclude Include="GS\Renderers\SW\GSRendererSW.h" />
+    <ClInclude Include="GS\Renderers\SW\GSScanlineEnvironment.h" />
+    <ClInclude Include="GS\Window\GSSetting.h" />
+    <ClInclude Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.h" />
+    <ClInclude Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.all.h" />
+    <ClInclude Include="GS\GSState.h" />
+    <ClInclude Include="GS\GSTables.h" />
+    <ClInclude Include="GS\Renderers\Common\GSTexture.h" />
+    <ClInclude Include="GS\Renderers\DX11\GSTexture11.h" />
+    <ClInclude Include="GS\Renderers\OpenGL\GSTextureOGL.h" />
+    <ClInclude Include="GS\Renderers\HW\GSTextureCache.h" />
+    <ClInclude Include="GS\Renderers\SW\GSTextureCacheSW.h" />
+    <ClInclude Include="GS\Renderers\Null\GSTextureNull.h" />
+    <ClInclude Include="GS\Renderers\SW\GSTextureSW.h" />
+    <ClInclude Include="GS\GSThread.h" />
+    <ClInclude Include="GS\GSThread_CXX11.h" />
+    <ClInclude Include="GS\Renderers\OpenGL\GSUniformBufferOGL.h" />
+    <ClInclude Include="GS\GSUtil.h" />
+    <ClInclude Include="GS\GSVector.h" />
+    <ClInclude Include="GS\GSVector4i.h" />
+    <ClInclude Include="GS\GSVector4.h" />
+    <ClInclude Include="GS\GSVector8i.h" />
+    <ClInclude Include="GS\GSVector8.h" />
+    <ClInclude Include="GS\Renderers\Common\GSVertex.h" />
+    <ClInclude Include="GS\Renderers\HW\GSVertexHW.h" />
+    <ClInclude Include="GS\Renderers\Common\GSVertexList.h" />
+    <ClInclude Include="GS\Renderers\SW\GSVertexSW.h" />
+    <ClInclude Include="GS\Renderers\Common\GSVertexTrace.h" />
+    <ClInclude Include="GS\resource.h" />
+    <ClInclude Include="IPU\IPUdma.h" />
+    <ClInclude Include="Mdec.h" />
+    <ClInclude Include="Patch.h" />
+    <ClInclude Include="PCSX2Base.h" />
+    <ClInclude Include="PrecompiledHeader.h" />
+    <ClInclude Include="sio_internal.h" />
+    <ClInclude Include="ps2\pgif.h" />
+    <ClInclude Include="USB\USB.h" />
+    <ClInclude Include="Utilities\AsciiFile.h" />
+    <ClInclude Include="Elfheader.h" />
+    <ClInclude Include="CDVD\IsoFileFormats.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="Config.h" />
+    <ClInclude Include="Dump.h" />
+    <ClInclude Include="IopCommon.h" />
+    <ClInclude Include="SaveState.h" />
+    <ClInclude Include="SingleRegisterTypes.h" />
+    <ClInclude Include="System.h" />
+    <ClInclude Include="System\SysThreads.h" />
+    <ClInclude Include="System\RecTypes.h" />
+    <ClInclude Include="Counters.h" />
+    <ClInclude Include="Dmac.h" />
+    <ClInclude Include="Hardware.h" />
+    <ClInclude Include="Hw.h" />
+    <ClInclude Include="ps2\HwInternal.h" />
+    <ClInclude Include="Cache.h" />
+    <ClInclude Include="Memory.h" />
+    <ClInclude Include="VMManager.h" />
+    <ClInclude Include="vtlb.h" />
+    <ClInclude Include="MTVU.h" />
+    <ClInclude Include="VU.h" />
+    <ClInclude Include="VUmicro.h" />
+    <ClInclude Include="x86\microVU.h" />
+    <ClInclude Include="x86\microVU_IR.h" />
+    <ClInclude Include="x86\microVU_Misc.h" />
+    <ClInclude Include="x86\microVU_Profiler.h" />
+    <ClInclude Include="x86\R5900_Profiler.h" />
+    <ClInclude Include="VUflags.h" />
+    <ClInclude Include="VUops.h" />
+    <ClInclude Include="Sif.h" />
+    <ClInclude Include="Sifcmd.h" />
+    <ClInclude Include="Vif.h" />
+    <ClInclude Include="Vif_Dma.h" />
+    <ClInclude Include="Vif_Unpack.h" />
+    <ClInclude Include="x86\newVif.h" />
+    <ClInclude Include="x86\newVif_HashBucket.h" />
+    <ClInclude Include="x86\newVif_UnpackSSE.h" />
+    <ClInclude Include="SPR.h" />
+    <ClInclude Include="Gif.h" />
+    <ClInclude Include="R5900.h" />
+    <ClInclude Include="R5900Exceptions.h" />
+    <ClInclude Include="R5900OpcodeTables.h" />
+    <ClInclude Include="COP0.h" />
+    <ClInclude Include="x86\iCOP0.h" />
+    <ClInclude Include="x86\iFPU.h" />
+    <ClInclude Include="x86\iMMI.h" />
+    <ClInclude Include="x86\iR5900.h" />
+    <ClInclude Include="x86\iR5900Arit.h" />
+    <ClInclude Include="x86\iR5900AritImm.h" />
+    <ClInclude Include="x86\iR5900Branch.h" />
+    <ClInclude Include="x86\iR5900Jump.h" />
+    <ClInclude Include="x86\iR5900LoadStore.h" />
+    <ClInclude Include="x86\iR5900Move.h" />
+    <ClInclude Include="x86\iR5900MultDiv.h" />
+    <ClInclude Include="x86\iR5900Shift.h" />
+    <ClInclude Include="IopBios.h" />
+    <ClInclude Include="IopCounters.h" />
+    <ClInclude Include="IopDma.h" />
+    <ClInclude Include="IopMem.h" />
+    <ClInclude Include="IopSio2.h" />
+    <ClInclude Include="R3000A.h" />
+    <ClInclude Include="Sio.h" />
+    <ClInclude Include="x86\iR3000A.h" />
+    <ClInclude Include="IopHw.h" />
+    <ClInclude Include="ps2\Iop\IopHw_Internal.h" />
+    <ClInclude Include="CDVD\CdRom.h" />
+    <ClInclude Include="CDVD\CDVD.h" />
+    <ClInclude Include="CDVD\CDVD_internal.h" />
+    <ClInclude Include="CDVD\CDVDaccess.h" />
+    <ClInclude Include="CDVD\CDVDisoReader.h" />
+    <ClInclude Include="Ipu\IPU.h" />
+    <ClInclude Include="Ipu\IPU_Fifo.h" />
+    <ClInclude Include="Ipu\yuv2rgb.h" />
+    <ClInclude Include="Ipu\mpeg2lib\Mpeg.h" />
+    <ClInclude Include="Ipu\mpeg2lib\Vlc.h" />
+    <ClInclude Include="GS.h" />
+    <ClInclude Include="DebugTools\Debug.h" />
+    <ClInclude Include="DebugTools\DisASM.h" />
+    <ClInclude Include="DebugTools\DisVUmicro.h" />
+    <ClInclude Include="DebugTools\DisVUops.h" />
+    <CustomBuildStep Include="rdebug\deci2.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_dbgp.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_dcmp.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_drfp.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_iloadp.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_netmp.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_ttyp.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <ClInclude Include="x86\BaseblockEx.h" />
+    <ClInclude Include="ps2\BiosTools.h" />
+    <ClInclude Include="MemoryTypes.h" />
+    <ClInclude Include="x86\iCore.h" />
+    <ClInclude Include="CDVD\IsoFS\IsoDirectory.h" />
+    <ClInclude Include="CDVD\IsoFS\IsoFile.h" />
+    <ClInclude Include="CDVD\IsoFS\IsoFileDescriptor.h" />
+    <ClInclude Include="CDVD\IsoFS\IsoFS.h" />
+    <ClInclude Include="CDVD\IsoFS\IsoFSCDVD.h" />
+    <ClInclude Include="CDVD\IsoFS\SectorSource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="GS\GS.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)3rdparty\baseclasses\baseclasses.vcxproj">
+      <Project>{27f17499-a372-4408-8afa-4f9f4584fbd3}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\fmt\fmt.vcxproj">
+      <Project>{449ad25e-424a-4714-babc-68706cdcc33b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\libjpeg\libjpeg.vcxproj">
+      <Project>{bc236261-77e8-4567-8d09-45cd02965eb6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\libpng\projects\vstudio\libpng\libpng.vcxproj">
+      <Project>{d6973076-9317-4ef2-a0b8-b7a18ac0713e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\libsamplerate\libsamplerate.vcxproj">
+      <Project>{47afdbef-f15f-4bc0-b436-5be443c3f80f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\pthreads4w\build\pthreads4w.vcxproj">
+      <Project>{0fae817d-9a32-4830-857e-81da57246e16}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\soundtouch\SoundTouch.vcxproj">
+      <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj">
+      <Project>{3fcc50c2-81e9-5db2-b8d8-2129427568b1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\xz\liblzma.vcxproj">
+      <Project>{12728250-16ec-4dc6-94d7-e21dd88947f8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\libchdr\libchdr.vcxproj">
+      <Project>{a0d2b3ad-1f72-4ee3-8b5c-f2c358da35f0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\zlib\zlib.vcxproj">
+      <Project>{2f6c0388-20cb-4242-9f6c-a6ebb6a83f47}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)tools\bin2cpp\bin2c.vcxproj">
+      <Project>{677b7d11-d5e1-40b3-88b1-9a4df83d2213}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\jpgd\jpgd.vcxproj">
+      <Project>{ed2f21fd-0a36-4a8f-9b90-e7d92a2acb63}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\cubeb\cubeb.vcxproj">
+      <Project>{bf74c473-dc04-44b3-92e8-4145f4e77342}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\rapidyaml\ryml.vcxproj">
+      <Project>{de9653b6-17dd-356a-9ee0-28a731772587}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)3rdparty\imgui\imgui.vcxproj">
+      <Project>{88fb34ec-845e-4f21-a552-f1573b9ed167}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\common\common.vcxproj">
+      <Project>{4639972e-424e-4e13-8b07-ca403c481346}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\3rdparty\glad\glad.vcxproj">
+      <Project>{c0293b32-5acf-40f0-aa6c-e6da6f3bf33a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
\ No newline at end of file
diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters
new file mode 100644
index 0000000000..a04ae4ba5f
--- /dev/null
+++ b/pcsx2/pcsx2core.vcxproj.filters
@@ -0,0 +1,2005 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Misc">
+      <UniqueIdentifier>{d1e5f218-107b-4e8c-9527-55cb9388b544}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Misc\Utilities">
+      <UniqueIdentifier>{acd41072-b36e-4653-a430-40ade53fb78a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Docs">
+      <UniqueIdentifier>{5dc872c1-db13-4c70-9d44-a3fc4b6fc241}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System">
+      <UniqueIdentifier>{3cda6808-a2bd-48a7-912e-161a7d0f5bce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\ISO">
+      <UniqueIdentifier>{a3f5cf44-2d2b-4822-b530-57286c85374a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Include">
+      <UniqueIdentifier>{a7187804-2892-4f90-9360-cf2bd6c31540}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2">
+      <UniqueIdentifier>{1c7a3f63-9285-4202-84c5-278a854db932}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine">
+      <UniqueIdentifier>{33efddb9-1e44-44dc-b857-45b49b22c750}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\Hardware">
+      <UniqueIdentifier>{c1691a12-a08a-4ca7-ba66-b4ff4c7f30a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\Memory">
+      <UniqueIdentifier>{57bf864f-d216-4d97-968d-4c0ff4f166ec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\VU">
+      <UniqueIdentifier>{7865c84c-6431-4781-a016-45eeac5cad2c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\VU\Dynarec">
+      <UniqueIdentifier>{c4ee1612-1ce9-4c74-8323-f98851014558}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\VU\Dynarec\microVU">
+      <UniqueIdentifier>{a210a307-e8bf-4bbc-8770-e720cc7fc953}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\VU\Interpreter">
+      <UniqueIdentifier>{e14056ea-b126-4e5b-94e0-3ce09463970b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC">
+      <UniqueIdentifier>{4ba4f2e2-5195-471b-9a0d-d84fa3fb96aa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\Sif">
+      <UniqueIdentifier>{088d96f1-2b69-4c53-9f14-026db3368905}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\Vif">
+      <UniqueIdentifier>{259f9912-d495-45da-b894-8312fde18364}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\Vif\Unpack">
+      <UniqueIdentifier>{5f98cd09-41cd-4c1e-ad7d-06a8859e770c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif">
+      <UniqueIdentifier>{620afa6f-3aea-4093-bed0-46fd37a5ad6d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec">
+      <UniqueIdentifier>{f9de9bc0-4bc5-4fb5-8a1f-04bc31a82b07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\SPR">
+      <UniqueIdentifier>{a6b34a13-67af-45fd-a2fb-2c86a762dd39}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\DMAC\Gif">
+      <UniqueIdentifier>{89c4908d-b0a1-4c69-9104-00e0af69a714}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\EE">
+      <UniqueIdentifier>{f5c8a322-8f48-44a8-97ad-4bd0017bdfe7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\EE\Dynarec">
+      <UniqueIdentifier>{79aa85ae-b75b-421a-838c-8144d9dacd76}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\EE\Dynarec\ix86-32">
+      <UniqueIdentifier>{094486fe-8ffc-4b98-81d6-6c381554fd8e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\EmotionEngine\EE\Interpreter">
+      <UniqueIdentifier>{409f8654-a1cd-4624-9ede-3ae83a707876}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop">
+      <UniqueIdentifier>{e373743e-ee9f-421c-aa28-2d02a08bb252}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop\Dynarec">
+      <UniqueIdentifier>{5a3ec813-4719-4ca1-9988-3587ea402a2b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop\Hardware">
+      <UniqueIdentifier>{a11bcdd7-008e-40aa-9376-d1cc2bf4e67c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop\CDVD">
+      <UniqueIdentifier>{8aa116a4-8bae-4ec0-a919-be8a320491eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\IPU">
+      <UniqueIdentifier>{4dab2d06-69e0-4f3e-b6d3-45e5e85af940}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\IPU\mpeg2lib">
+      <UniqueIdentifier>{67e51016-d1db-44d2-910d-349d2833f798}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS">
+      <UniqueIdentifier>{5602cc18-9d1c-49c8-9509-7e4cf9ecd91b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Debug">
+      <UniqueIdentifier>{ffa6c572-1615-4dad-80c3-333e3eb476f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Debug\rdebug">
+      <UniqueIdentifier>{bba4d866-e26f-49c8-83fb-fb970c33798b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Include">
+      <UniqueIdentifier>{96937113-fef0-4e63-92e5-a30edcc78dc2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\iCore">
+      <UniqueIdentifier>{5e741f2d-9e0b-4e43-b2a2-44a8370e1546}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\IsoFS">
+      <UniqueIdentifier>{c5237754-2509-4291-b869-c5dacc1a8aba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop\CDVD\Windows">
+      <UniqueIdentifier>{be861049-a142-4650-85a5-a2fdd4eef011}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop\CDVD\Linux">
+      <UniqueIdentifier>{a5904fb6-e846-4cbf-940c-ca1c604140a0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\Iop\FW">
+      <UniqueIdentifier>{157740ae-b338-4d7f-81cb-cffa9d39a756}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\SPU2">
+      <UniqueIdentifier>{bed493d6-96dc-4057-a1f2-31f88ec927d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9">
+      <UniqueIdentifier>{8d5454f9-590c-4c53-aae1-8391c6465e50}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\ATA">
+      <UniqueIdentifier>{bc20f567-851d-4440-a3fd-ef470241962e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\ATA\Commands">
+      <UniqueIdentifier>{9e9b52d7-7b1c-44b2-82d8-1e0d8085e7e0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\InternalServers">
+      <UniqueIdentifier>{93da3d51-9457-4fde-b374-c2fbe4780f59}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\PacketReader">
+      <UniqueIdentifier>{57c4be94-9a2c-469b-9b02-b3b324857fc5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\PacketReader\IP">
+      <UniqueIdentifier>{a0723e13-c839-464d-8cfa-6c440ae03537}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\PacketReader\IP\UDP">
+      <UniqueIdentifier>{db2fc75d-6552-4991-9155-885abd8796e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\PacketReader\IP\UDP\DHCP">
+      <UniqueIdentifier>{d426ae2b-9ad6-473d-adba-57b7bdac87db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\PacketReader\IP\UDP\DNS">
+      <UniqueIdentifier>{229bf045-e378-4ec5-bdf8-43938762511e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\DEV9\Sessions">
+      <UniqueIdentifier>{64b05697-98cd-48ed-b5a5-cb0f6044ca15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB">
+      <UniqueIdentifier>{df9de75c-2272-4f73-b2a0-4f9f492ba1e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\PAD">
+      <UniqueIdentifier>{e1cbcaf6-9f65-4f14-9e89-27dd0f10e047}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Shaders">
+      <UniqueIdentifier>{38f3b97b-eac6-4085-b6b0-567ec5081242}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers">
+      <UniqueIdentifier>{f65f5552-af5b-47b0-9029-48d4dc33c2f9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\Direct3D">
+      <UniqueIdentifier>{6e0dc702-cb44-4a22-a595-4cbd335f31a4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\Hardware">
+      <UniqueIdentifier>{85d4539e-fc10-4369-98f0-0ee9a6a9cc00}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\Null">
+      <UniqueIdentifier>{5be27550-9ed4-4c27-9e69-e5933613c4e8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\Software">
+      <UniqueIdentifier>{8a0a142d-a4e0-4e8d-afbf-955fe1697eca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\OpenGL">
+      <UniqueIdentifier>{c140280a-87c6-4433-b877-f0bf8cca9345}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\Common">
+      <UniqueIdentifier>{81af12a1-9605-4dd8-a70e-fd4ae81fbdd5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Window">
+      <UniqueIdentifier>{eaa22029-6839-4c09-93e1-faea8d8c0d7c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\GIF">
+      <UniqueIdentifier>{78f5077b-255e-435e-9a51-352171dfaee8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Host">
+      <UniqueIdentifier>{65f21394-287a-471b-a0c1-d8f0d5d95a81}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Renderers\Vulkan">
+      <UniqueIdentifier>{98829aa9-bb81-4564-bd6e-128719c4faa0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Shaders\OpenGL">
+      <UniqueIdentifier>{0ba8b3c9-0915-4228-a572-3526190efb00}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Shaders\Common">
+      <UniqueIdentifier>{7699b8f4-a217-4d8a-bf08-e28e58b3ae07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Shaders\Vulkan">
+      <UniqueIdentifier>{8c7c08ed-6c87-4b10-82ca-c832e84828c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\GS\Shaders\Direct3D11">
+      <UniqueIdentifier>{eb697f5b-85f5-424a-a7e4-8d8b73d3426e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Utilities\folderdesc.txt">
+      <Filter>Misc</Filter>
+    </None>
+    <None Include="Docs\License.txt">
+      <Filter>Docs</Filter>
+    </None>
+    <None Include="ps2\eeHwTraceLog.inl">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </None>
+    <None Include="x86\microVU_Alloc.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Analyze.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Branch.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Clamp.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Compile.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Execute.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Flags.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Log.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Lower.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Macro.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Misc.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Tables.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="x86\microVU_Upper.inl">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\convert.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\interlace.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\merge.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\tfx_vgs.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\tfx_fs.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\shadeboost.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\opengl\common_header.glsl">
+      <Filter>System\Ps2\GS\Shaders\OpenGL</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\common\fxaa.fx">
+      <Filter>System\Ps2\GS\Shaders\Common</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\vulkan\interlace.glsl">
+      <Filter>System\Ps2\GS\Shaders\Vulkan</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\vulkan\convert.glsl">
+      <Filter>System\Ps2\GS\Shaders\Vulkan</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\vulkan\merge.glsl">
+      <Filter>System\Ps2\GS\Shaders\Vulkan</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\vulkan\tfx.glsl">
+      <Filter>System\Ps2\GS\Shaders\Vulkan</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\dx11\tfx.fx">
+      <Filter>System\Ps2\GS\Shaders\Direct3D11</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\dx11\shadeboost.fx">
+      <Filter>System\Ps2\GS\Shaders\Direct3D11</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\dx11\merge.fx">
+      <Filter>System\Ps2\GS\Shaders\Direct3D11</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\dx11\interlace.fx">
+      <Filter>System\Ps2\GS\Shaders\Direct3D11</Filter>
+    </None>
+    <None Include="..\bin\resources\shaders\dx11\convert.fx">
+      <Filter>System\Ps2\GS\Shaders\Direct3D11</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Patch.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="PrecompiledHeader.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClInclude Include="resource.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClCompile Include="ShiftJisToUnicode.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="Utilities\FileUtils.cpp">
+      <Filter>Misc\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Dump.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iMisc.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="Pcsx2Config.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="SaveState.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="SourceLog.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="System.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="System\SysThreadBase.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="Elfheader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\BaseblockEx.cpp">
+      <Filter>System\Ps2</Filter>
+    </ClCompile>
+    <ClCompile Include="ps2\BiosTools.cpp">
+      <Filter>System\Ps2</Filter>
+    </ClCompile>
+    <ClCompile Include="Counters.cpp">
+      <Filter>System\Ps2\EmotionEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="FiFo.cpp">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="Hw.cpp">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="HwRead.cpp">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="HwWrite.cpp">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="Cache.cpp">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClCompile>
+    <ClCompile Include="Memory.cpp">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\recVTLB.cpp">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClCompile>
+    <ClCompile Include="vtlb.cpp">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClCompile>
+    <ClCompile Include="MTVU.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU</Filter>
+    </ClCompile>
+    <ClCompile Include="VUmicro.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU</Filter>
+    </ClCompile>
+    <ClCompile Include="VUmicroMem.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\microVU.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </ClCompile>
+    <ClCompile Include="VU0.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="VU0micro.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="VU0microInterp.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="VU1micro.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="VU1microInterp.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="VUflags.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="VUops.cpp">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Sif.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Sif</Filter>
+    </ClCompile>
+    <ClCompile Include="Sif0.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Sif</Filter>
+    </ClCompile>
+    <ClCompile Include="Sif1.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Sif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif0_Dma.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif1_Dma.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif1_MFIFO.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif_Codes.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif_Transfer.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClCompile>
+    <ClCompile Include="Vif_Unpack.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\newVif_Unpack.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\newVif_Dynarec.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\newVif_UnpackSSE.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="SPR.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\SPR</Filter>
+    </ClCompile>
+    <ClCompile Include="Gif.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Gif</Filter>
+    </ClCompile>
+    <ClCompile Include="R5900OpcodeTables.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iCOP0.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iFPU.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iFPUd.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iMMI.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iR5900Misc.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ir5900tables.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900-32.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900Arit.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900AritImm.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900Branch.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900Jump.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900LoadStore.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900Move.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900MultDiv.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900Shift.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iR5900Templates.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
+    </ClCompile>
+    <ClCompile Include="COP0.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="COP2.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="FPU.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Interpreter.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="MMI.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="R5900.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="R5900OpcodeImpl.cpp">
+      <Filter>System\Ps2\EmotionEngine\EE\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="IopBios.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="IopCounters.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="IopDma.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="IopIrq.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="IopMem.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="IopSio2.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="R3000A.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="R3000AInterpreter.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="R3000AOpcodeTables.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="Sio.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iR3000A.cpp">
+      <Filter>System\Ps2\Iop\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iR3000Atables.cpp">
+      <Filter>System\Ps2\Iop\Dynarec</Filter>
+    </ClCompile>
+    <ClCompile Include="IopHw.cpp">
+      <Filter>System\Ps2\Iop\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="ps2\Iop\IopHwRead.cpp">
+      <Filter>System\Ps2\Iop\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="ps2\Iop\IopHwWrite.cpp">
+      <Filter>System\Ps2\Iop\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CdRom.cpp">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CDVD.cpp">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CDVDaccess.cpp">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CDVDisoReader.cpp">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\IPU.cpp">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\IPU_Fifo.cpp">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\yuv2rgb.cpp">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\mpeg2lib\Idct.cpp">
+      <Filter>System\Ps2\IPU\mpeg2lib</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\mpeg2lib\Mpeg.cpp">
+      <Filter>System\Ps2\IPU\mpeg2lib</Filter>
+    </ClCompile>
+    <ClCompile Include="GS.cpp">
+      <Filter>System\Ps2\GS\GIF</Filter>
+    </ClCompile>
+    <ClCompile Include="GSState.cpp">
+      <Filter>System\Ps2\GS\GIF</Filter>
+    </ClCompile>
+    <ClCompile Include="MTGS.cpp">
+      <Filter>System\Ps2\GS\GIF</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\DisR3000A.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\DisR5900asm.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\DisVU0Micro.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\DisVU1Micro.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2.cpp">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_dbgp.cpp">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_dcmp.cpp">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_iloadp.cpp">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_netmp.cpp">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </ClCompile>
+    <ClCompile Include="rdebug\deci2_ttyp.cpp">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\ix86-32\iCore-32.cpp">
+      <Filter>System\Ps2\iCore</Filter>
+    </ClCompile>
+    <ClCompile Include="x86\iCore.cpp">
+      <Filter>System\Ps2\iCore</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\IsoFS\IsoFile.cpp">
+      <Filter>System\IsoFS</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\IsoFS\IsoFS.cpp">
+      <Filter>System\IsoFS</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\IsoFS\IsoFSCDVD.cpp">
+      <Filter>System\IsoFS</Filter>
+    </ClCompile>
+    <ClCompile Include="GameDatabase.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="Patch_Memory.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\IPUdma.cpp">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClCompile>
+    <ClCompile Include="ps2\LegacyDmac.cpp">
+      <Filter>System\Ps2</Filter>
+    </ClCompile>
+    <ClCompile Include="Gif_Unit.cpp">
+      <Filter>System\Ps2\GS\GIF</Filter>
+    </ClCompile>
+    <ClCompile Include="Gif_Logger.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="windows\FlatFileReaderWindows.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="Darwin\DarwinFlatFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\InputIsoFile.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="MultipartFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\OutputIsoFile.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\BlockdumpFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\SymbolMap.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\DebugInterface.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\DisassemblyManager.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\MIPSAnalyst.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\Breakpoints.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\ExpressionParser.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="sif2.cpp">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Sif</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CompressedFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\MipsAssemblerTables.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\MipsAssembler.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\BiosDebugData.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugTools\MipsStackWalk.cpp">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\ThreadedFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CsoFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\GzippedFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\ChunksCache.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="IopGte.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="ps2\pgif.cpp">
+      <Filter>System\Ps2</Filter>
+    </ClCompile>
+    <ClCompile Include="Mdec.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="ps2\Iop\PsxBios.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="IPU\IPUdither.cpp">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CDVDdiscReader.cpp">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\CDVDdiscThread.cpp">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\Windows\DriveUtility.cpp">
+      <Filter>System\Ps2\Iop\CDVD\Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\Windows\IOCtlSrc.cpp">
+      <Filter>System\Ps2\Iop\CDVD\Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\Linux\IOCtlSrc.cpp">
+      <Filter>System\Ps2\Iop\CDVD\Linux</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\Linux\DriveUtility.cpp">
+      <Filter>System\Ps2\Iop\CDVD\Linux</Filter>
+    </ClCompile>
+    <ClCompile Include="PINE.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="FW.cpp">
+      <Filter>System\Ps2\Iop\FW</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Dma.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\spu2.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\spu2freeze.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\spu2sys.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Mixer.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\ADSR.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Debug.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\DplIIdecoder.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\ReadInput.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\RegLog.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\RegTable.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Reverb.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\SndOut.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Timestretcher.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Wavedump_wav.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_Command.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdDMA.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdExecuteDeviceDiag.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdNoData.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdPIOData.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_CmdSMART.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\Commands\ATA_SCE.cpp">
+      <Filter>System\Ps2\DEV9\ATA\Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\ATA_Info.cpp">
+      <Filter>System\Ps2\DEV9\ATA</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\ATA_State.cpp">
+      <Filter>System\Ps2\DEV9\ATA</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\ATA_Transfer.cpp">
+      <Filter>System\Ps2\DEV9\ATA</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\ATA\HddCreate.cpp">
+      <Filter>System\Ps2\DEV9\ATA</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\DEV9Config.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\DEV9.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\flash.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\InternalServers\DHCP_Server.cpp">
+      <Filter>System\Ps2\DEV9\InternalServers</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\InternalServers\DNS_Logger.cpp">
+      <Filter>System\Ps2\DEV9\InternalServers</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\InternalServers\DNS_Server.cpp">
+      <Filter>System\Ps2\DEV9\InternalServers</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Options.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DHCP</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Packet.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DHCP</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Classes.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DNS</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Packet.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DNS</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\UDP\UDP_Packet.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\IP_Options.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\IP\IP_Packet.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader\IP</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\EthernetFrame.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\PacketReader\NetLib.cpp">
+      <Filter>System\Ps2\DEV9\PacketReader</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\pcap_io.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\Win32\pcap_io_win32.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\smap.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\net.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\Win32\tap-win32.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV9\Win32\DEV9WinConfig.cpp">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GS.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSAlignedClass.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSBlock.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSClut.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSCodeBuffer.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSCrc.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSDump.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSLocalMemory.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSPerfMon.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSState.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSTables.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSUtil.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSVector.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSPng.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSRingHeap.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSLzma.cpp">
+      <Filter>System\Ps2\GS</Filter>
+    </ClCompile>
+    <ClCompile Include="CDVD\ChdFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\DX11\GSDevice11.cpp">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\DX11\GSTexture11.cpp">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\DX11\GSTextureFX11.cpp">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\OpenGL\GLLoader.cpp">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\OpenGL\GSDeviceOGL.cpp">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\OpenGL\GSTextureOGL.cpp">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\OpenGL\GLState.cpp">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSDrawingContext.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSDrawScanline.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.all.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSNewCodeGenerator.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSRendererSW.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.all.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSTextureCacheSW.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSTextureSW.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSVertexSW.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\SW\GSRasterizer.cpp">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Null\GSDeviceNull.cpp">
+      <Filter>System\Ps2\GS\Renderers\Null</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Null\GSRendererNull.cpp">
+      <Filter>System\Ps2\GS\Renderers\Null</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Null\GSTextureNull.cpp">
+      <Filter>System\Ps2\GS\Renderers\Null</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\HW\GSRendererHW.cpp">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\HW\GSRendererNew.cpp">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\HW\GSTextureCache.cpp">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\HW\GSHwHack.cpp">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSRenderer.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSDirtyRect.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSDevice.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSTexture.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSVertexTrace.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSVertexList.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Common\GSFunctionMap.cpp">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\GSCapture.cpp">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Window\GSCaptureDlg.cpp">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Window\GSDialog.cpp">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Window\GSSetting.cpp">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Window\GSwxDialog.cpp">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\DX11\D3D.cpp">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClCompile>
+    <ClCompile Include="MemoryCardFile.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="MemoryCardFolder.cpp">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClCompile>
+    <ClCompile Include="PerformanceMetrics.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\SndOut_Cubeb.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="HostDisplay.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\OpenGLHostDisplay.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\D3D11HostDisplay.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\ImGuiManager.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Host.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\VulkanHostDisplay.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\imgui_impl_vulkan.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Vulkan\GSTextureVK.cpp">
+      <Filter>System\Ps2\GS\Renderers\Vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="GS\Renderers\Vulkan\GSDeviceVK.cpp">
+      <Filter>System\Ps2\GS\Renderers\Vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\GameList.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\INISettingsInterface.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\InputManager.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\InputSource.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\LayeredSettingsInterface.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\SDLInputSource.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="Frontend\XInputSource.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Host\ConfigDebug.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Host\ConfigSoundTouch.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Host\Dialogs.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Host\CfgHelpers.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Host\Config.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="USB\USBNull.cpp">
+      <Filter>System\Ps2\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="HostSettings.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="VMManager.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="PAD\Host\KeyStatus.cpp">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClCompile>
+    <ClCompile Include="PAD\Host\PAD.cpp">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClCompile>
+    <ClCompile Include="PAD\Host\StateManagement.cpp">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClCompile>
+    <ClCompile Include="SPU2\Windows\SndOut_XAudio2.cpp">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClCompile>
+    <ClCompile Include="windows\Optimus.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+    <ClCompile Include="windows\WinCompressNTFS.cpp">
+      <Filter>Host</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Patch.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="PCSX2Base.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="PrecompiledHeader.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="Utilities\AsciiFile.h">
+      <Filter>Misc\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Elfheader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFileFormats.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="Common.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="Config.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="Dump.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="IopCommon.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="SaveState.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="SingleRegisterTypes.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="System.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="System\SysThreads.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="System\RecTypes.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="Counters.h">
+      <Filter>System\Ps2\EmotionEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="Dmac.h">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="Hardware.h">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="Hw.h">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="ps2\HwInternal.h">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="Cache.h">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Memory.h">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="vtlb.h">
+      <Filter>System\Ps2\EmotionEngine\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="MTVU.h">
+      <Filter>System\Ps2\EmotionEngine\VU</Filter>
+    </ClInclude>
+    <ClInclude Include="VU.h">
+      <Filter>System\Ps2\EmotionEngine\VU</Filter>
+    </ClInclude>
+    <ClInclude Include="VUmicro.h">
+      <Filter>System\Ps2\EmotionEngine\VU</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\microVU.h">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\microVU_IR.h">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\microVU_Misc.h">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </ClInclude>
+    <ClInclude Include="VUflags.h">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="VUops.h">
+      <Filter>System\Ps2\EmotionEngine\VU\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Sif.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Sif</Filter>
+    </ClInclude>
+    <ClInclude Include="Sifcmd.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Sif</Filter>
+    </ClInclude>
+    <ClInclude Include="Vif.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClInclude>
+    <ClInclude Include="Vif_Dma.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif</Filter>
+    </ClInclude>
+    <ClInclude Include="Vif_Unpack.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\newVif.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\newVif_HashBucket.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\newVif_UnpackSSE.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="SPR.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\SPR</Filter>
+    </ClInclude>
+    <ClInclude Include="Gif.h">
+      <Filter>System\Ps2\EmotionEngine\DMAC\Gif</Filter>
+    </ClInclude>
+    <ClInclude Include="R5900.h">
+      <Filter>System\Ps2\EmotionEngine\EE</Filter>
+    </ClInclude>
+    <ClInclude Include="R5900Exceptions.h">
+      <Filter>System\Ps2\EmotionEngine\EE</Filter>
+    </ClInclude>
+    <ClInclude Include="R5900OpcodeTables.h">
+      <Filter>System\Ps2\EmotionEngine\EE</Filter>
+    </ClInclude>
+    <ClInclude Include="COP0.h">
+      <Filter>System\Ps2\EmotionEngine\EE</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iCOP0.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iFPU.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iMMI.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900Arit.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900AritImm.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900Branch.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900Jump.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900LoadStore.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900Move.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900MultDiv.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR5900Shift.h">
+      <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="IopBios.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="IopCounters.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="IopDma.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="IopMem.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="IopSio2.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="R3000A.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="Sio.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iR3000A.h">
+      <Filter>System\Ps2\Iop\Dynarec</Filter>
+    </ClInclude>
+    <ClInclude Include="IopHw.h">
+      <Filter>System\Ps2\Iop\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="ps2\Iop\IopHw_Internal.h">
+      <Filter>System\Ps2\Iop\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CdRom.h">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CDVD.h">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CDVD_internal.h">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CDVDaccess.h">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CDVDisoReader.h">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClInclude>
+    <ClInclude Include="IPU\IPU.h">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClInclude>
+    <ClInclude Include="IPU\IPU_Fifo.h">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClInclude>
+    <ClInclude Include="IPU\yuv2rgb.h">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClInclude>
+    <ClInclude Include="IPU\mpeg2lib\Mpeg.h">
+      <Filter>System\Ps2\IPU\mpeg2lib</Filter>
+    </ClInclude>
+    <ClInclude Include="IPU\mpeg2lib\Vlc.h">
+      <Filter>System\Ps2\IPU\mpeg2lib</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\Debug.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\DisASM.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\DisVUmicro.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\DisVUops.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\BaseblockEx.h">
+      <Filter>System\Ps2\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="ps2\BiosTools.h">
+      <Filter>System\Ps2\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="MemoryTypes.h">
+      <Filter>System\Ps2\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\iCore.h">
+      <Filter>System\Ps2\iCore</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFS\IsoDirectory.h">
+      <Filter>System\IsoFS</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFS\IsoFile.h">
+      <Filter>System\IsoFS</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFS\IsoFileDescriptor.h">
+      <Filter>System\IsoFS</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFS\IsoFS.h">
+      <Filter>System\IsoFS</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFS\IsoFSCDVD.h">
+      <Filter>System\IsoFS</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\IsoFS\SectorSource.h">
+      <Filter>System\IsoFS</Filter>
+    </ClInclude>
+    <ClInclude Include="GameDatabase.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="IPU\IPUdma.h">
+      <Filter>System\Ps2\IPU</Filter>
+    </ClInclude>
+    <ClInclude Include="Gif_Unit.h">
+      <Filter>System\Ps2\GS\GIF</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\microVU_Profiler.h">
+      <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
+    </ClInclude>
+    <ClInclude Include="AsyncFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\SymbolMap.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\DebugInterface.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\DisassemblyManager.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\MIPSAnalyst.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\Breakpoints.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\ExpressionParser.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\zlib_indexed.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\MipsAssemblerTables.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\MipsAssembler.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\BiosDebugData.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="DebugTools\MipsStackWalk.h">
+      <Filter>System\Ps2\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\ThreadedFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\ChdFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CsoFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CompressedFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\GzippedFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\ChunksCache.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CompressedFileReaderUtils.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
+    <ClInclude Include="x86\R5900_Profiler.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="IopGte.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="sio_internal.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="ps2\pgif.h">
+      <Filter>System\Ps2</Filter>
+    </ClInclude>
+    <ClInclude Include="Mdec.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="CDVD\CDVDdiscReader.h">
+      <Filter>System\Ps2\Iop\CDVD</Filter>
+    </ClInclude>
+    <ClInclude Include="PINE.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="FW.h">
+      <Filter>System\Ps2\Iop\FW</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\spu2.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\Mixer.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\interpolate_table.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\Config.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\defs.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\Dma.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\Global.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\regs.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\SndOut.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\spdif.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\ATA\ATA.h">
+      <Filter>System\Ps2\DEV9\ATA</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\ATA\HddCreate.h">
+      <Filter>System\Ps2\DEV9\ATA</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\Config.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\DEV9.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\InternalServers\DHCP_Server.h">
+      <Filter>System\Ps2\DEV9\InternalServers</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\InternalServers\DNS_Logger.h">
+      <Filter>System\Ps2\DEV9\InternalServers</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\InternalServers\DNS_Server.h">
+      <Filter>System\Ps2\DEV9\InternalServers</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\net.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Options.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DHCP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DHCP\DHCP_Packet.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DHCP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Classes.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DNS</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Enums.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DNS</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\DNS\DNS_Packet.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP\DNS</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\UDP\UDP_Packet.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP\UDP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Address.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Options.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Packet.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\IP\IP_Payload.h">
+      <Filter>System\Ps2\DEV9\PacketReader\IP</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\EthernetFrame.h">
+      <Filter>System\Ps2\DEV9\PacketReader</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\NetLib.h">
+      <Filter>System\Ps2\DEV9\PacketReader</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\PacketReader\Payload.h">
+      <Filter>System\Ps2\DEV9\PacketReader</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\pcap_io.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\SimpleQueue.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\smap.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\Win32\pcap_io_win32_funcs.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV9\Win32\tap.h">
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="USB\USB.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GS.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSExtra.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSIntrin.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSGL.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSRegs.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSAlignedClass.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSBlock.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSClut.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSCodeBuffer.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSCrc.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSDump.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSLocalMemory.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSPerfMon.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSState.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSTables.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSThread.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSUtil.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSVector.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSVector4i.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSVector4.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSVector8i.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSVector8.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\config.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSPng.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSRingHeap.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSThread_CXX11.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSLzma.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSFastList.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS.h">
+      <Filter>System\Ps2\GS\GIF</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\DX11\GSDevice11.h">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\DX11\GSTexture11.h">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\OpenGL\GLLoader.h">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\OpenGL\GSDeviceOGL.h">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\OpenGL\GSTextureOGL.h">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\OpenGL\GLState.h">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSDrawingContext.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSDrawingEnvironment.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSDrawScanline.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSDrawScanlineCodeGenerator.all.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSNewCodeGenerator.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSRendererSW.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSScanlineEnvironment.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSSetupPrimCodeGenerator.all.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSTextureCacheSW.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSTextureSW.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSVertexSW.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\SW\GSRasterizer.h">
+      <Filter>System\Ps2\GS\Renderers\Software</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Null\GSDeviceNull.h">
+      <Filter>System\Ps2\GS\Renderers\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Null\GSRendererNull.h">
+      <Filter>System\Ps2\GS\Renderers\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Null\GSTextureNull.h">
+      <Filter>System\Ps2\GS\Renderers\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\HW\GSRendererHW.h">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\HW\GSRendererNew.h">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\HW\GSTextureCache.h">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\HW\GSVertexHW.h">
+      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\OpenGL\GSUniformBufferOGL.h">
+      <Filter>System\Ps2\GS\Renderers\OpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSRenderer.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSDirtyRect.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSDevice.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSTexture.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSVertexTrace.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSVertexList.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSVertex.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Common\GSFunctionMap.h">
+      <Filter>System\Ps2\GS\Renderers\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GSCapture.h">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Window\GSCaptureDlg.h">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Window\GSDialog.h">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Window\GSSetting.h">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\resource.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Window\GSwxDialog.h">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\DX11\D3D.h">
+      <Filter>System\Ps2\GS\Renderers\Direct3D</Filter>
+    </ClInclude>
+    <ClInclude Include="MemoryCardFolder.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="MemoryCardFile.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
+    <ClInclude Include="PerformanceMetrics.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="Host.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="HostDisplay.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\OpenGLHostDisplay.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\D3D11HostDisplay.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\ImGuiManager.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\VulkanHostDisplay.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Vulkan\GSTextureVK.h">
+      <Filter>System\Ps2\GS\Renderers\Vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\Renderers\Vulkan\GSDeviceVK.h">
+      <Filter>System\Ps2\GS\Renderers\Vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="GS.h" />
+    <ClInclude Include="Frontend\GameList.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\INISettingsInterface.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\InputManager.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\InputSource.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\LayeredSettingsInterface.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\SDLInputSource.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="Frontend\XInputSource.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\Host\Config.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="SPU2\Host\Dialogs.h">
+      <Filter>System\Ps2\SPU2</Filter>
+    </ClInclude>
+    <ClInclude Include="HostSettings.h">
+      <Filter>Host</Filter>
+    </ClInclude>
+    <ClInclude Include="VMManager.h">
+      <Filter>System</Filter>
+    </ClInclude>
+    <ClInclude Include="PAD\Gamepad.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+    <ClInclude Include="PAD\Host\KeyStatus.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+    <ClInclude Include="PAD\Host\PAD.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+    <ClInclude Include="PAD\Host\StateManagement.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+    <ClInclude Include="PAD\Host\Global.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="GS\GS.rc">
+      <Filter>System\Ps2\GS</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuildStep Include="rdebug\deci2.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_dbgp.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_dcmp.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_drfp.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_iloadp.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_netmp.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="rdebug\deci2_ttyp.h">
+      <Filter>System\Ps2\Debug\rdebug</Filter>
+    </CustomBuildStep>
+  </ItemGroup>
+</Project>
\ No newline at end of file