Partial commit: Preview

2024-11-22 02:32:36 +01:00 · 2016-02-02 00:40:38 +03:00 · 2016-02-02 00:40:38 +03:00 · 5fc6f59821
commit 5fc6f59821
parent 7c1ab47262
20 changed files with 1327 additions and 1997 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -53,7 +53,7 @@ before_install:
    fi;
 before_script:
- - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
+ - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp
 - mkdir build
 - cd build
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi
--- a/README.md
+++ b/README.md
@ -37,9 +37,11 @@ __Mac OSX__
 ### Building
-To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source.
+To initialize the repository don't forget to execute `git submodule update --init` to pull the submodules.
 * __Windows__:
-Open the *.SLN* file, and press *Build* > *Clean Solution*, then *Build Solution*. *Rebuild* may not work correctly.
+1) Open the *.SLN* file.
 2) Build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*.
 3) Press *BUILD* > *Build Solution* or *Rebuild Solution*.
 * __Linux & Mac OSX__:
 If you want to build with LLVM, then LLVM 3.6.2 is required.
 `cd rpcs3 && cmake CMakeLists.txt && make && cd ../` then run with `cd bin && ./rpcs3`.
--- a/appveyor.yml
+++ b/appveyor.yml
@ -14,7 +14,7 @@ branches:
 before_build:
 # until git for win 2.5 release with commit checkout
- - git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit rsx_program_decompiler 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
+ - git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp
 - 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null
 - 7z x zlib.7z -aos -oC:\rpcs3\ > null
 - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/)
--- a/rpcs3.sln
+++ b/rpcs3.sln
@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}"
 	ProjectSection(ProjectDependencies) = postProject
@ -161,11 +161,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asmjit", "asmjit", "{E2A982F2-4B1A-48B1-8D77-A17A589C58D7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vcxproj", "{C4A10229-4712-4BD2-B63E-50D93C67A038}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8BC303AB-25BE-4276-8E57-73F171B2D672} = {8BC303AB-25BE-4276-8E57-73F171B2D672}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "llvm", "llvm", "{C8068CE9-D626-4FEA-BEE7-893F06A25BF3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "llvm_build\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}"
 EndProject
@ -209,8 +204,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zlib", "zlib", "{F0C19EFA-E
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\libpng\projects\vstudio\zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vulkan", "Vulkan", "{09AD61F7-97FE-4FF8-8F7F-63FEA9B746F4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vulkan-build", "Vulkan\Vulkan-build\Vulkan-build.vcxproj", "{58B40697-B15E-429E-B325-D52C28AEBCBF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang-build", "Vulkan\glslang-build\glslang-build.vcxproj", "{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}"
@ -221,17 +214,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKGSRender", "rpcs3\VKGSRen
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPULLVMRecompiler", "rpcs3\PPULLVMRecompiler.vcxproj", "{304A6E8B-A311-4EC5-8045-BFA8D08175CE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wxWidgets\build\msw\wx_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yaml-cpp", "yaml-cpp", "{DDF904CA-2771-441A-8629-5DF2EB922A79}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__BUILD_BEFORE", "__BUILD_BEFORE", "{B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "Utilities\yaml-cpp.vcxproj", "{FDC361C5-7734-493B-8CFB-037308B35122}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - LLVM|x64 = Debug - LLVM|x64
 		Debug - MemLeak|x64 = Debug - MemLeak|x64
 		Debug|x64 = Debug|x64
 		DLL Debug|x64 = DLL Debug|x64
 		DLL Release|x64 = DLL Release|x64
 		Release - LLVM|x64 = Release - LLVM|x64
 		Release|x64 = Release|x64
 	EndGlobalSection
@ -242,10 +237,6 @@ Global
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|x64.Build.0 = Debug|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.ActiveCfg = Release|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.Build.0 = Release|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64
@ -256,10 +247,6 @@ Global
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release - LLVM|x64.Build.0 = Release|x64
 		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64
@ -270,10 +257,6 @@ Global
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release - LLVM|x64.Build.0 = Release|x64
 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64
@ -284,10 +267,6 @@ Global
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release - LLVM|x64.Build.0 = Release|x64
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
@ -298,10 +277,6 @@ Global
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release - LLVM|x64.Build.0 = Release|x64
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
@ -312,10 +287,6 @@ Global
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.ActiveCfg = Debug|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release - LLVM|x64.Build.0 = Release|x64
 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.ActiveCfg = Release|x64
@ -326,10 +297,6 @@ Global
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.ActiveCfg = Debug|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release - LLVM|x64.Build.0 = Release|x64
 		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.ActiveCfg = Release|x64
@ -338,13 +305,8 @@ Global
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug - MemLeak|x64.Deploy.0 = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release - LLVM|x64.Build.0 = Release|x64
 		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
@ -355,10 +317,6 @@ Global
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release - LLVM|x64.Build.0 = Release|x64
 		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
@ -369,10 +327,6 @@ Global
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release - LLVM|x64.Build.0 = Release|x64
 		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
@ -383,10 +337,6 @@ Global
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release - LLVM|x64.Build.0 = Release|x64
 		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.ActiveCfg = Release|x64
@ -397,10 +347,6 @@ Global
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release - LLVM|x64.Build.0 = Release|x64
 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
@ -411,10 +357,6 @@ Global
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.ActiveCfg = Debug|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release - LLVM|x64.Build.0 = Release|x64
 		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.ActiveCfg = Release|x64
@ -425,10 +367,6 @@ Global
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.ActiveCfg = Debug|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release - LLVM|x64.Build.0 = Release|x64
 		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.ActiveCfg = Release|x64
@ -439,10 +377,6 @@ Global
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.ActiveCfg = Debug|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release - LLVM|x64.Build.0 = Release|x64
 		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.ActiveCfg = Release|x64
@ -453,10 +387,6 @@ Global
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release - LLVM|x64.Build.0 = Release|x64
 		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.ActiveCfg = Release|x64
@ -467,10 +397,6 @@ Global
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.ActiveCfg = Debug|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release - LLVM|x64.Build.0 = Release|x64
 		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.ActiveCfg = Release|x64
@ -481,10 +407,6 @@ Global
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.ActiveCfg = Debug|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release - LLVM|x64.Build.0 = Release|x64
 		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.ActiveCfg = Release|x64
@ -495,10 +417,6 @@ Global
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release - LLVM|x64.Build.0 = Release|x64
 		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
@ -509,10 +427,6 @@ Global
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release - LLVM|x64.Build.0 = Release|x64
 		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
@ -523,10 +437,6 @@ Global
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release - LLVM|x64.Build.0 = Release|x64
 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64
@ -537,10 +447,6 @@ Global
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.Release - LLVM|x64.Build.0 = Release|x64
 		{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64
@ -551,10 +457,6 @@ Global
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release - LLVM|x64.Build.0 = Release|x64
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64
@ -565,10 +467,6 @@ Global
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.ActiveCfg = Debug|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.Build.0 = Debug|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.DLL Debug|x64.Build.0 = Debug|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.DLL Release|x64.ActiveCfg = Release|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.DLL Release|x64.Build.0 = Release|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{AC40FF01-426E-4838-A317-66354CEFAE88}.Release|x64.ActiveCfg = Release|x64
@ -579,24 +477,14 @@ Global
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.ActiveCfg = Debug|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.Build.0 = Debug|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.DLL Debug|x64.Build.0 = Debug|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.DLL Release|x64.ActiveCfg = Release|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.DLL Release|x64.Build.0 = Release|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.ActiveCfg = Release|x64
 		{C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.Build.0 = Release|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug|x64.ActiveCfg = Debug|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.DLL Debug|x64.Build.0 = Debug|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.DLL Release|x64.ActiveCfg = Release|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.DLL Release|x64.Build.0 = Release|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Release - LLVM|x64.Build.0 = Release|x64
 		{8BC303AB-25BE-4276-8E57-73F171B2D672}.Release|x64.ActiveCfg = Release|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug - LLVM|x64.Build.0 = Debug|x64
@ -604,10 +492,6 @@ Global
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.ActiveCfg = Debug|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.Build.0 = Debug|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|x64.Build.0 = DLL Release|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release - LLVM|x64.Build.0 = Release|x64
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.ActiveCfg = Release|x64
@ -618,10 +502,6 @@ Global
 		{00D36322-6188-4A66-B514-3B3F183E998D}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.Debug|x64.ActiveCfg = Debug|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.Debug|x64.Build.0 = Debug|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.DLL Release|x64.Build.0 = DLL Release|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.Release - LLVM|x64.Build.0 = Release|x64
 		{00D36322-6188-4A66-B514-3B3F183E998D}.Release|x64.ActiveCfg = Release|x64
@ -632,24 +512,14 @@ Global
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Debug|x64.ActiveCfg = Debug|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Debug|x64.Build.0 = Debug|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.DLL Debug|x64.Build.0 = Debug|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.DLL Release|x64.ActiveCfg = Release|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.DLL Release|x64.Build.0 = Release|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Release|x64.ActiveCfg = Release|x64
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Release|x64.Build.0 = Release|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug|x64.ActiveCfg = Debug|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Debug|x64.Build.0 = Debug|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Release|x64.ActiveCfg = Release|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Release|x64.Build.0 = Release|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release - LLVM|x64.Build.0 = Release|x64
 		{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release|x64.ActiveCfg = Release|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
@ -657,10 +527,6 @@ Global
 		{3384223A-6D97-4799-9862-359F85312892}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Debug|x64.ActiveCfg = Debug|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Debug|x64.Build.0 = Debug|x64
 		{3384223A-6D97-4799-9862-359F85312892}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{3384223A-6D97-4799-9862-359F85312892}.DLL Debug|x64.Build.0 = Debug|x64
 		{3384223A-6D97-4799-9862-359F85312892}.DLL Release|x64.ActiveCfg = Release|x64
 		{3384223A-6D97-4799-9862-359F85312892}.DLL Release|x64.Build.0 = Release|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{3384223A-6D97-4799-9862-359F85312892}.Release|x64.ActiveCfg = Release|x64
@ -671,10 +537,6 @@ Global
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug|x64.ActiveCfg = Debug|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug|x64.Build.0 = Debug|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Debug|x64.Build.0 = Debug|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Release|x64.ActiveCfg = Release|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Release|x64.Build.0 = Release|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release - LLVM|x64.Build.0 = Release|x64
 		{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release|x64.ActiveCfg = Release|x64
@ -685,10 +547,6 @@ Global
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug|x64.ActiveCfg = Debug|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug|x64.Build.0 = Debug|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Debug|x64.Build.0 = Debug|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Release|x64.ActiveCfg = Release|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Release|x64.Build.0 = Release|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release - LLVM|x64.Build.0 = Release|x64
 		{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release|x64.ActiveCfg = Release|x64
@ -699,10 +557,6 @@ Global
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug|x64.ActiveCfg = Debug|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug|x64.Build.0 = Debug|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.DLL Debug|x64.Build.0 = Debug|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.DLL Release|x64.ActiveCfg = Release|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.DLL Release|x64.Build.0 = Release|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release|x64.ActiveCfg = Release|x64
@ -713,10 +567,6 @@ Global
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug|x64.ActiveCfg = Debug|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug|x64.Build.0 = Debug|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.DLL Debug|x64.Build.0 = Debug|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.DLL Release|x64.ActiveCfg = Release|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.DLL Release|x64.Build.0 = Release|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release|x64.ActiveCfg = Release|x64
@ -727,10 +577,6 @@ Global
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug - MemLeak|x64.Build.0 = Debug Library|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug Library|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug Library|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.DLL Debug|x64.Build.0 = Debug|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.DLL Release|x64.ActiveCfg = Release|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.DLL Release|x64.Build.0 = Release|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release - LLVM|x64.ActiveCfg = Release Library|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release - LLVM|x64.Build.0 = Release Library|x64
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release Library|x64
@ -741,84 +587,50 @@ Global
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug - MemLeak|x64.Build.0 = Debug Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.DLL Debug|x64.ActiveCfg = Debug Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.DLL Debug|x64.Build.0 = Debug Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.DLL Release|x64.ActiveCfg = Release Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.DLL Release|x64.Build.0 = Release Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release - LLVM|x64.ActiveCfg = Release Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release - LLVM|x64.Build.0 = Release Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release Library|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Debug|x64.ActiveCfg = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Debug|x64.Build.0 = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.DLL Debug|x64.Build.0 = Debug|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.DLL Release|x64.ActiveCfg = Release|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.DLL Release|x64.Build.0 = Release|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Release - LLVM|x64.Build.0 = Release|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Release|x64.ActiveCfg = Release|x64
 		{58B40697-B15E-429E-B325-D52C28AEBCBF}.Release|x64.Build.0 = Release|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug|x64.ActiveCfg = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug|x64.Build.0 = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.DLL Debug|x64.Build.0 = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.DLL Release|x64.ActiveCfg = Release|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.DLL Release|x64.Build.0 = Release|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release - LLVM|x64.Build.0 = Release|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release|x64.ActiveCfg = Release|x64
-		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release|x64.Build.0 = Release|x64
+		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
-		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.ActiveCfg = Debug|x64
+		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
-		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.Build.0 = Debug|x64
+		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64
-		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
+		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug|x64.ActiveCfg = Debug|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug|x64.Build.0 = Debug|x64
-		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.DLL Debug|x64.ActiveCfg = Debug|x64
+		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
-		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.DLL Debug|x64.Build.0 = Debug|x64
+		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.DLL Release|x64.ActiveCfg = Release|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.DLL Release|x64.Build.0 = Release|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release - LLVM|x64.Build.0 = Release|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release|x64.ActiveCfg = Release|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release|x64.Build.0 = Release|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Debug|x64.ActiveCfg = Debug|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Debug|x64.Build.0 = Debug|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.DLL Debug|x64.ActiveCfg = Debug|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.DLL Debug|x64.Build.0 = Debug|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.DLL Release|x64.ActiveCfg = Release|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.DLL Release|x64.Build.0 = Release|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Release|x64.ActiveCfg = Release|x64
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE}.Release|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release - LLVM|x64.Build.0 = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Debug - LLVM|x64.ActiveCfg = Debug|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Debug - LLVM|x64.Build.0 = Debug|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Debug - MemLeak|x64.Build.0 = Debug|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Debug|x64.ActiveCfg = Debug|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Debug|x64.Build.0 = Debug|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Release - LLVM|x64.ActiveCfg = Release|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Release - LLVM|x64.Build.0 = Release|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Release|x64.ActiveCfg = Release|x64
 		{FDC361C5-7734-493B-8CFB-037308B35122}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -848,8 +660,7 @@ Global
 		{74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
 		{AC40FF01-426E-4838-A317-66354CEFAE88} = {E2A982F2-4B1A-48B1-8D77-A17A589C58D7}
 		{C4A10229-4712-4BD2-B63E-50D93C67A038} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
-		{C8068CE9-D626-4FEA-BEE7-893F06A25BF3} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
+		{8BC303AB-25BE-4276-8E57-73F171B2D672} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
 		{8BC303AB-25BE-4276-8E57-73F171B2D672} = {C8068CE9-D626-4FEA-BEE7-893F06A25BF3}
 		{01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
 		{00D36322-6188-4A66-B514-3B3F183E998D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
 		{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
@ -859,10 +670,10 @@ Global
 		{30A05C4D-F5FD-421C-A864-17A64BDEAA75} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {A17D34F1-7E3E-4841-818D-3B7C6F5AF829}
 		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {F0C19EFA-EDD0-43F2-97C1-18E865E96B4E}
-		{58B40697-B15E-429E-B325-D52C28AEBCBF} = {09AD61F7-97FE-4FF8-8F7F-63FEA9B746F4}
+		{58B40697-B15E-429E-B325-D52C28AEBCBF} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
-		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {09AD61F7-97FE-4FF8-8F7F-63FEA9B746F4}
+		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{304A6E8B-A311-4EC5-8045-BFA8D08175CE} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{A8E8442A-078A-5FC5-B495-8D71BA77EE6E} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
 		{FDC361C5-7734-493B-8CFB-037308B35122} = {DDF904CA-2771-441A-8629-5DF2EB922A79}
 	EndGlobalSection
 EndGlobal
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@ -112,8 +112,8 @@ ${LLVM_INCLUDE_DIRS}
 "${RPCS3_SRC_DIR}/Loader"
 "${RPCS3_SRC_DIR}/Crypto"
 "${RPCS3_SRC_DIR}/.."
 "${RPCS3_SRC_DIR}/../Utilities/yaml-cpp/include"
 "${RPCS3_SRC_DIR}/../asmjit/src/asmjit"
 "${RPCS3_SRC_DIR}/../3rdparty/glm"
 "${RPCS3_SRC_DIR}/../3rdparty/libpng"
 "${RPCS3_SRC_DIR}/../3rdparty/GSL/include"
 "${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler"
@ -165,17 +165,10 @@ endforeach()
 file(
 GLOB_RECURSE
 RPCS3_SRC
-"${RPCS3_SRC_DIR}/rpcs3.cpp"
+"${RPCS3_SRC_DIR}/*.cpp"
-"${RPCS3_SRC_DIR}/config.cpp"
+"${RPCS3_SRC_DIR}/../Utilities/*.cpp"
-"${RPCS3_SRC_DIR}/stb_image.cpp"
+"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*.cpp"
-"${RPCS3_SRC_DIR}/../Utilities/GNU.cpp"
+"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*.cpp"
 "${RPCS3_SRC_DIR}/Emu/*"
 "${RPCS3_SRC_DIR}/Gui/*"
 "${RPCS3_SRC_DIR}/Loader/*"
 "${RPCS3_SRC_DIR}/Crypto/*"
 "${RPCS3_SRC_DIR}/../Utilities/*"
 "${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*"
 "${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*"
 )
 if(APPLE)
--- a/rpcs3/D3D12GSRender.vcxproj
+++ b/rpcs3/D3D12GSRender.vcxproj
@ -61,11 +61,6 @@
    <Import Project="..\rpcs3_llvm.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup>
    <ClCompile>
      <TreatWarningAsError>true</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="Emu\RSX\D3D12\D3D12Utils.h" />
    <ClInclude Include="Emu\RSX\D3D12\D3D12CommonDecompiler.h" />
--- a/rpcs3/VKGSRender.vcxproj
+++ b/rpcs3/VKGSRender.vcxproj
@ -92,54 +92,9 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWarningAsError>true</TreatWarningAsError>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWarningAsError>true</TreatWarningAsError>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWarningAsError>true</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWarningAsError>true</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWarningAsError>true</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@ -58,103 +58,206 @@
    <Import Project="..\rpcs3_release.props" />
    <Import Project="..\rpcs3_llvm.props" />
  </ImportGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
+  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>..\llvm\include;..\llvm_build\include;</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>..\llvm\include;..\llvm_build\include;</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>..\llvm\include;..\llvm_build\include;</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>..\llvm\include;..\llvm_build\include;</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <AdditionalIncludeDirectories>..\llvm\include;..\llvm_build\include;</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\Utilities\AutoPause.cpp" />
-    <ClCompile Include="..\Utilities\config_context.cpp" />
+    <ClCompile Include="..\Utilities\Log.cpp">
-    <ClCompile Include="..\Utilities\Log.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    <ClCompile Include="..\Utilities\File.cpp" />
+    </ClCompile>
-    <ClCompile Include="..\Utilities\rPlatform.cpp" />
+    <ClCompile Include="..\Utilities\File.cpp">
-    <ClCompile Include="..\Utilities\rTime.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="..\Utilities\Config.cpp" />
    <ClCompile Include="..\Utilities\rXml.cpp" />
    <ClCompile Include="..\Utilities\Semaphore.cpp" />
-    <ClCompile Include="..\Utilities\SharedMutex.cpp" />
+    <ClCompile Include="..\Utilities\StrFmt.cpp">
-    <ClCompile Include="..\Utilities\SleepQueue.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    <ClCompile Include="..\Utilities\StrFmt.cpp" />
+    </ClCompile>
    <ClCompile Include="..\Utilities\Thread.cpp" />
    <ClCompile Include="..\Utilities\VirtualMemory.cpp" />
-    <ClCompile Include="config.cpp" />
+    <ClCompile Include="Emu\ARMv7\ARMv7Module.cpp" />
    <ClCompile Include="Emu\Cell\lv2\lv2.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_cond.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_dbg.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_event.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_event_flag.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_fs.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_interrupt.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_lwcond.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_lwmutex.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_memory.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_mmapper.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_mutex.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_ppu_thread.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_process.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_prx.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_rsx.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_rwlock.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_semaphore.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_spu.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_time.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_timer.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_trace.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_tty.cpp" />
    <ClCompile Include="Emu\Cell\lv2\sys_vm.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_libc_.cpp" />
    <ClCompile Include="Emu\Cell\PPUModule.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellAdec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellAtrac.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellAtracMulti.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellAudio.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellAudioOut.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellAvconfExt.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellBgdl.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellCamera.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellCelp8Enc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellCelpEnc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellDaisy.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellDmux.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellFiber.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellFont.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellFontFT.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellFs.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellGame.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellGameExec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellGcmSys.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellGem.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellGifDec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellHttp.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellHttpUtil.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellImejp.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellJpgDec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellJpgEnc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellKb.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellKey2char.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellL10n.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellMic.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellMouse.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellMsgDialog.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellMusic.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellMusicDecode.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellMusicExport.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellNetCtl.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellOskDialog.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellOvis.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPad.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPamf.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPhotoDecode.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPhotoExport.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPhotoImport.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPngDec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPngEnc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellPrint.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellRec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellRemotePlay.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellResc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellRtc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellRudp.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSail.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSailRec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSaveData.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellScreenshot.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSearch.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSheap.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSpudll.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSpurs.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSpursJq.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSpursSpu.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSsl.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellStorage.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSubdisplay.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSync.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSync2.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysconf.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysmodule.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysutil.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysutilAp.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysutilAvc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysutilAvc2.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellSysutilMisc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellUsbd.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellUsbpspcm.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellUserInfo.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellVdec.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellVideoExport.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellVideoOut.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellVideoUpload.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellVoice.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellVpost.cpp" />
    <ClCompile Include="Emu\Cell\Modules\cellWebBrowser.cpp" />
    <ClCompile Include="Emu\Cell\Modules\libmixer.cpp" />
    <ClCompile Include="Emu\Cell\Modules\libsnd3.cpp" />
    <ClCompile Include="Emu\Cell\Modules\libsynth2.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNp.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNp2.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNpClans.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNpCommerce2.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNpSns.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNpTrophy.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNpTus.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sceNpUtil.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sysPrxForUser.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_game.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_heap.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_io.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_libc.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_lv2dbg.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_lwcond_.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_lwmutex_.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_mempool.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_mmapper_.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_net.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_ppu_thread_.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_prx_.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_spinlock.cpp" />
    <ClCompile Include="Emu\Cell\Modules\sys_spu_.cpp" />
    <ClCompile Include="Emu\Cell\PPUCallback.cpp" />
    <ClCompile Include="Emu\Cell\PPUDisAsm.cpp" />
    <ClCompile Include="Emu\Cell\PPUFunction.cpp" />
    <ClCompile Include="Emu\Cell\PPUInterpreter.cpp" />
    <ClCompile Include="Emu\Cell\SPUAnalyser.cpp" />
    <ClCompile Include="Emu\Cell\SPUASMJITRecompiler.cpp" />
    <ClCompile Include="Emu\Cell\SPUDisAsm.cpp" />
    <ClCompile Include="Emu\Cell\SPUInterpreter.cpp" />
    <ClCompile Include="Emu\events.cpp" />
    <ClCompile Include="Emu\IdManager.cpp" />
    <ClCompile Include="Emu\RSX\CgBinaryFragmentProgram.cpp" />
    <ClCompile Include="Emu\RSX\CgBinaryVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\Common\BufferUtils.cpp">
+    <ClCompile Include="Emu\RSX\Common\BufferUtils.cpp" />
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">true</TreatWarningAsError>
    </ClCompile>
    <ClCompile Include="Emu\RSX\Common\FragmentProgramDecompiler.cpp" />
    <ClCompile Include="Emu\RSX\Common\ProgramStateCache.cpp" />
    <ClCompile Include="Emu\RSX\Common\ShaderParam.cpp" />
    <ClCompile Include="Emu\RSX\Common\surface_store.cpp" />
-    <ClCompile Include="Emu\RSX\Common\TextureUtils.cpp">
+    <ClCompile Include="Emu\RSX\Common\TextureUtils.cpp" />
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatWarningAsError>
      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">true</TreatWarningAsError>
    </ClCompile>
    <ClCompile Include="Emu\RSX\Common\VertexProgramDecompiler.cpp" />
    <ClCompile Include="Emu\RSX\GCM.cpp" />
    <ClCompile Include="Emu\RSX\Null\NullGSRender.cpp" />
    <ClCompile Include="Emu\RSX\rsx_methods.cpp" />
    <ClCompile Include="Emu\RSX\rsx_utils.cpp" />
-    <ClCompile Include="Emu\state.cpp" />
+    <ClCompile Include="Crypto\aes.cpp">
-    <ClCompile Include="Emu\SysCalls\lv2\sys_dbg.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_fs.cpp" />
+    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellAtracMulti.cpp" />
+    <ClCompile Include="Crypto\ec.cpp">
-    <ClCompile Include="Emu\SysCalls\Modules\cellAudioOut.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    <ClCompile Include="Emu\SysCalls\Modules\cellDaisy.cpp" />
+    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellFs.cpp" />
+    <ClCompile Include="Crypto\key_vault.cpp">
-    <ClCompile Include="Emu\SysCalls\Modules\cellGameExec.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    <ClCompile Include="Emu\SysCalls\Modules\cellMusic.cpp" />
+    </ClCompile>
    <ClCompile Include="Emu\SysCalls\Modules\cellOskDialog.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellRec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellRemotePlay.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSpudll.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSpursSpu.cpp" />
    <ClCompile Include="Crypto\aes.cpp" />
    <ClCompile Include="Crypto\ec.cpp" />
    <ClCompile Include="Crypto\key_vault.cpp" />
    <ClCompile Include="Crypto\lz.cpp">
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="Crypto\sha1.cpp" />
+    <ClCompile Include="Crypto\sha1.cpp">
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="Crypto\unedat.cpp" />
    <ClCompile Include="Crypto\unpkg.cpp" />
    <ClCompile Include="Crypto\unself.cpp" />
-    <ClCompile Include="Crypto\utils.cpp" />
+    <ClCompile Include="Crypto\utils.cpp">
-    <ClCompile Include="Emu\ARMv7\ARMv7Decoder.cpp" />
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="Emu\ARMv7\ARMv7DisAsm.cpp" />
    <ClCompile Include="Emu\ARMv7\ARMv7Interpreter.cpp" />
    <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
@ -217,168 +320,24 @@
    <ClCompile Include="Emu\ARMv7\Modules\sceVideodec.cpp" />
    <ClCompile Include="Emu\ARMv7\Modules\sceVoice.cpp" />
    <ClCompile Include="Emu\ARMv7\Modules\sceVoiceQoS.cpp" />
-    <ClCompile Include="Emu\ARMv7\Modules\sceXml.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceLibXml.cpp" />
-    <ClCompile Include="Emu\ARMv7\PSVFuncList.cpp" />
+    <ClCompile Include="Emu\ARMv7\ARMv7Function.cpp" />
    <ClCompile Include="Emu\Audio\AudioDumper.cpp" />
    <ClCompile Include="Emu\Audio\AudioManager.cpp" />
    <ClCompile Include="Emu\Cell\MFC.cpp" />
    <ClCompile Include="Emu\Cell\PPCDecoder.cpp" />
    <ClCompile Include="Emu\Cell\PPUThread.cpp" />
    <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
    <ClCompile Include="Emu\Cell\SPURecompiler.cpp" />
    <ClCompile Include="Emu\Cell\SPUThread.cpp" />
    <ClCompile Include="Emu\CPU\CPUThread.cpp" />
-    <ClCompile Include="Emu\CPU\CPUThreadManager.cpp" />
+    <ClCompile Include="Emu\VFS.cpp" />
-    <ClCompile Include="Emu\Event.cpp" />
+    <ClCompile Include="Emu\Memory\Memory.cpp">
-    <ClCompile Include="Emu\FS\VFS.cpp" />
+      <ObjectFileName>$(IntDir)OldMemory.obj</ObjectFileName>
-    <ClCompile Include="Emu\FS\vfsDevice.cpp" />
+    </ClCompile>
    <ClCompile Include="Emu\FS\vfsDeviceLocalFile.cpp" />
    <ClCompile Include="Emu\FS\vfsDir.cpp" />
    <ClCompile Include="Emu\FS\vfsDirBase.cpp" />
    <ClCompile Include="Emu\FS\vfsFile.cpp" />
    <ClCompile Include="Emu\FS\vfsFileBase.cpp" />
    <ClCompile Include="Emu\FS\vfsLocalDir.cpp" />
    <ClCompile Include="Emu\FS\vfsLocalFile.cpp" />
    <ClCompile Include="Emu\FS\vfsStream.cpp" />
    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp" />
    <ClCompile Include="Emu\HDD\HDD.cpp" />
    <ClCompile Include="Emu\Io\Keyboard.cpp" />
    <ClCompile Include="Emu\Io\Mouse.cpp" />
    <ClCompile Include="Emu\Io\Pad.cpp" />
    <ClCompile Include="Emu\Memory\Memory.cpp" />
    <ClCompile Include="Emu\RSX\GSManager.cpp" />
    <ClCompile Include="Emu\RSX\GSRender.cpp" />
    <ClCompile Include="Emu\RSX\RSXTexture.cpp" />
    <ClCompile Include="Emu\RSX\RSXThread.cpp" />
    <ClCompile Include="Emu\Memory\vm.cpp" />
    <ClCompile Include="Emu\SysCalls\Callback.cpp" />
    <ClCompile Include="Emu\SysCalls\FuncList.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_cond.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_event.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_event_flag.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_interrupt.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_lwcond.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_lwmutex.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_memory.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_mmapper.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_mutex.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_ppu_thread.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_process.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_prx.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_rsx.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_rwlock.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_semaphore.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_spu.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_time.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_timer.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_trace.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_tty.cpp" />
    <ClCompile Include="Emu\SysCalls\lv2\sys_vm.cpp" />
    <ClCompile Include="Emu\SysCalls\ModuleManager.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellAdec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellAtrac.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellAvconfExt.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellDmux.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellFont.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellFontFT.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellGame.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellMsgDialog.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPamf.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSpursJq.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellStorage.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysconf.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAp.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSaveData.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAvc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAvc2.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilMisc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellVideoExport.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellVideoOut.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellWebBrowser.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNp2.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellKb.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellMouse.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellPad.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sceNpUtil.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellVideoUpload.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_game.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_heap.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_lv2dbg.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\cellHttp.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_libc.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_lwcond_.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_lwmutex_.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_mempool.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_mmapper_.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_ppu_thread_.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_prx_.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_spinlock.cpp" />
    <ClCompile Include="Emu\SysCalls\Modules\sys_spu_.cpp" />
    <ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
    <ClCompile Include="Emu\System.cpp" />
    <ClCompile Include="Loader\ELF32.cpp" />
    <ClCompile Include="Loader\ELF64.cpp" />
    <ClCompile Include="Loader\Loader.cpp" />
    <ClCompile Include="Loader\PSF.cpp" />
    <ClCompile Include="Loader\TROPUSR.cpp" />
    <ClCompile Include="Loader\TRP.cpp" />
@ -393,14 +352,12 @@
    <ClInclude Include="..\Utilities\AutoPause.h" />
    <ClInclude Include="..\Utilities\BEType.h" />
    <ClInclude Include="..\Utilities\BitField.h" />
    <ClInclude Include="..\Utilities\config_context.h" />
    <ClInclude Include="..\Utilities\convert.h" />
    <ClInclude Include="..\Utilities\event.h" />
-    <ClInclude Include="..\Utilities\GNU.h" />
+    <ClInclude Include="..\Utilities\Platform.h" />
    <ClInclude Include="..\Utilities\Log.h" />
    <ClInclude Include="..\Utilities\File.h" />
-    <ClInclude Include="..\Utilities\rPlatform.h" />
+    <ClInclude Include="..\Utilities\Macro.h" />
-    <ClInclude Include="..\Utilities\rTime.h" />
+    <ClInclude Include="..\Utilities\Config.h" />
    <ClInclude Include="..\Utilities\rXml.h" />
    <ClInclude Include="..\Utilities\Semaphore.h" />
    <ClInclude Include="..\Utilities\SharedMutex.h" />
@ -410,7 +367,6 @@
    <ClInclude Include="..\Utilities\Timer.h" />
    <ClInclude Include="..\Utilities\types.h" />
    <ClInclude Include="..\Utilities\VirtualMemory.h" />
    <ClInclude Include="config.h" />
    <ClInclude Include="Crypto\aes.h" />
    <ClInclude Include="Crypto\ec.h" />
    <ClInclude Include="Crypto\key_vault.h" />
@ -422,12 +378,12 @@
    <ClInclude Include="Crypto\utils.h" />
    <ClInclude Include="define_new_memleakdetect.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Callback.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Context.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Module.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h" />
    <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
    <ClInclude Include="Emu\ARMv7\ErrorCodes.h" />
    <ClInclude Include="Emu\ARMv7\Modules\sceAppMgr.h" />
    <ClInclude Include="Emu\ARMv7\Modules\sceAppUtil.h" />
    <ClInclude Include="Emu\ARMv7\Modules\sceAudio.h" />
@ -485,64 +441,127 @@
    <ClInclude Include="Emu\ARMv7\Modules\sceVideodec.h" />
    <ClInclude Include="Emu\ARMv7\Modules\sceVoice.h" />
    <ClInclude Include="Emu\ARMv7\Modules\sceVoiceQoS.h" />
-    <ClInclude Include="Emu\ARMv7\Modules\sceXml.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceLibXml.h" />
-    <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Function.h" />
    <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
    <ClInclude Include="Emu\Audio\AudioDumper.h" />
    <ClInclude Include="Emu\Audio\AudioManager.h" />
    <ClInclude Include="Emu\Audio\AudioThread.h" />
    <ClInclude Include="Emu\Audio\Null\NullAudioThread.h" />
    <ClInclude Include="Emu\Cell\Common.h" />
    <ClInclude Include="Emu\Cell\ErrorCodes.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_cond.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_dbg.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_event.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_event_flag.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_fs.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_interrupt.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_lwcond.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_lwmutex.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_memory.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_mmapper.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_mutex.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_ppu_thread.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_process.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_prx.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_rsx.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_rwlock.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_semaphore.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_spu.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_sync.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_time.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_timer.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_trace.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_tty.h" />
    <ClInclude Include="Emu\Cell\lv2\sys_vm.h" />
    <ClInclude Include="Emu\Cell\MFC.h" />
-    <ClInclude Include="Emu\Cell\PPCDecoder.h" />
+    <ClInclude Include="Emu\Cell\PPUModule.h" />
    <ClInclude Include="Emu\Cell\Modules\cellAdec.h" />
    <ClInclude Include="Emu\Cell\Modules\cellAtrac.h" />
    <ClInclude Include="Emu\Cell\Modules\cellAtracMulti.h" />
    <ClInclude Include="Emu\Cell\Modules\cellAudio.h" />
    <ClInclude Include="Emu\Cell\Modules\cellAudioIn.h" />
    <ClInclude Include="Emu\Cell\Modules\cellAudioOut.h" />
    <ClInclude Include="Emu\Cell\Modules\cellCamera.h" />
    <ClInclude Include="Emu\Cell\Modules\cellDmux.h" />
    <ClInclude Include="Emu\Cell\Modules\cellFiber.h" />
    <ClInclude Include="Emu\Cell\Modules\cellFont.h" />
    <ClInclude Include="Emu\Cell\Modules\cellFontFT.h" />
    <ClInclude Include="Emu\Cell\Modules\cellFs.h" />
    <ClInclude Include="Emu\Cell\Modules\cellGame.h" />
    <ClInclude Include="Emu\Cell\Modules\cellGcmSys.h" />
    <ClInclude Include="Emu\Cell\Modules\cellGem.h" />
    <ClInclude Include="Emu\Cell\Modules\cellGifDec.h" />
    <ClInclude Include="Emu\Cell\Modules\cellJpgDec.h" />
    <ClInclude Include="Emu\Cell\Modules\cellKb.h" />
    <ClInclude Include="Emu\Cell\Modules\cellL10n.h" />
    <ClInclude Include="Emu\Cell\Modules\cellMic.h" />
    <ClInclude Include="Emu\Cell\Modules\cellMouse.h" />
    <ClInclude Include="Emu\Cell\Modules\cellMsgDialog.h" />
    <ClInclude Include="Emu\Cell\Modules\cellMusic.h" />
    <ClInclude Include="Emu\Cell\Modules\cellNetCtl.h" />
    <ClInclude Include="Emu\Cell\Modules\cellPad.h" />
    <ClInclude Include="Emu\Cell\Modules\cellPamf.h" />
    <ClInclude Include="Emu\Cell\Modules\cellPng.h" />
    <ClInclude Include="Emu\Cell\Modules\cellPngDec.h" />
    <ClInclude Include="Emu\Cell\Modules\cellResc.h" />
    <ClInclude Include="Emu\Cell\Modules\cellRtc.h" />
    <ClInclude Include="Emu\Cell\Modules\cellRudp.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSail.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSaveData.h" />
    <ClInclude Include="Emu\Cell\Modules\cellScreenshot.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSearch.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSpurs.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSpursJq.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSubdisplay.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSync.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSync2.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSysutil.h" />
    <ClInclude Include="Emu\Cell\Modules\cellSysutilAvc2.h" />
    <ClInclude Include="Emu\Cell\Modules\cellUsbd.h" />
    <ClInclude Include="Emu\Cell\Modules\cellUserInfo.h" />
    <ClInclude Include="Emu\Cell\Modules\cellVdec.h" />
    <ClInclude Include="Emu\Cell\Modules\cellVideoOut.h" />
    <ClInclude Include="Emu\Cell\Modules\cellVpost.h" />
    <ClInclude Include="Emu\Cell\Modules\cellWebBrowser.h" />
    <ClInclude Include="Emu\Cell\Modules\libmixer.h" />
    <ClInclude Include="Emu\Cell\Modules\libsnd3.h" />
    <ClInclude Include="Emu\Cell\Modules\libsynth2.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNp.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNp2.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNpClans.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNpCommerce2.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNpSns.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNpTrophy.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNpTus.h" />
    <ClInclude Include="Emu\Cell\Modules\sceNpUtil.h" />
    <ClInclude Include="Emu\Cell\Modules\sysPrxForUser.h" />
    <ClInclude Include="Emu\Cell\Modules\sys_lv2dbg.h" />
    <ClInclude Include="Emu\Cell\Modules\sys_net.h" />
    <ClInclude Include="Emu\Cell\PPCDisAsm.h" />
-    <ClInclude Include="Emu\Cell\PPCInstrTable.h" />
+    <ClInclude Include="Emu\Cell\PPUCallback.h" />
    <ClInclude Include="Emu\Cell\PPUDecoder.h" />
    <ClInclude Include="Emu\Cell\PPUDisAsm.h" />
-    <ClInclude Include="Emu\Cell\PPUInstrTable.h" />
+    <ClInclude Include="Emu\Cell\PPUFunction.h" />
    <ClInclude Include="Emu\Cell\PPUInterpreter.h" />
    <ClInclude Include="Emu\Cell\PPUInterpreter2.h" />
    <ClInclude Include="Emu\Cell\PPUOpcodes.h" />
    <ClInclude Include="Emu\Cell\PPUThread.h" />
    <ClInclude Include="Emu\Cell\RawSPUThread.h" />
    <ClInclude Include="Emu\Cell\SPUAnalyser.h" />
    <ClInclude Include="Emu\Cell\SPUASMJITRecompiler.h" />
    <ClInclude Include="Emu\Cell\SPUContext.h" />
    <ClInclude Include="Emu\Cell\SPUDisAsm.h" />
    <ClInclude Include="Emu\Cell\SPUInterpreter.h" />
    <ClInclude Include="Emu\Cell\SPUOpcodes.h" />
    <ClInclude Include="Emu\Cell\SPURecompiler.h" />
    <ClInclude Include="Emu\Cell\SPUThread.h" />
    <ClInclude Include="Emu\CPU\CPUDecoder.h" />
    <ClInclude Include="Emu\CPU\CPUDisAsm.h" />
    <ClInclude Include="Emu\CPU\CPUInstrTable.h" />
    <ClInclude Include="Emu\CPU\CPUThread.h" />
    <ClInclude Include="Emu\CPU\CPUThreadManager.h" />
    <ClInclude Include="Emu\DbgCommand.h" />
-    <ClInclude Include="Emu\Event.h" />
+    <ClInclude Include="Emu\VFS.h" />
    <ClInclude Include="Emu\events.h" />
    <ClInclude Include="Emu\FS\VFS.h" />
    <ClInclude Include="Emu\FS\vfsDevice.h" />
    <ClInclude Include="Emu\FS\vfsDeviceLocalFile.h" />
    <ClInclude Include="Emu\FS\vfsDir.h" />
    <ClInclude Include="Emu\FS\vfsDirBase.h" />
    <ClInclude Include="Emu\FS\vfsFile.h" />
    <ClInclude Include="Emu\FS\vfsFileBase.h" />
    <ClInclude Include="Emu\FS\vfsLocalDir.h" />
    <ClInclude Include="Emu\FS\vfsLocalFile.h" />
    <ClInclude Include="Emu\FS\vfsStream.h" />
    <ClInclude Include="Emu\FS\vfsStreamMemory.h" />
    <ClInclude Include="Emu\GameInfo.h" />
    <ClInclude Include="Emu\HDD\HDD.h" />
    <ClInclude Include="Emu\IdManager.h" />
    <ClInclude Include="Emu\Io\Keyboard.h" />
    <ClInclude Include="Emu\Io\KeyboardHandler.h" />
    <ClInclude Include="Emu\Io\Mouse.h" />
    <ClInclude Include="Emu\Io\MouseHandler.h" />
    <ClInclude Include="Emu\Io\Null\NullKeyboardHandler.h" />
    <ClInclude Include="Emu\Io\Null\NullMouseHandler.h" />
    <ClInclude Include="Emu\Io\Null\NullPadHandler.h" />
    <ClInclude Include="Emu\Io\Pad.h" />
    <ClInclude Include="Emu\Io\PadHandler.h" />
    <ClInclude Include="Emu\Memory\Memory.h" />
    <ClInclude Include="Emu\Memory\MemoryBlock.h" />
@ -556,7 +575,6 @@
    <ClInclude Include="Emu\RSX\Common\TextureUtils.h" />
    <ClInclude Include="Emu\RSX\Common\VertexProgramDecompiler.h" />
    <ClInclude Include="Emu\RSX\GCM.h" />
    <ClInclude Include="Emu\RSX\GSManager.h" />
    <ClInclude Include="Emu\RSX\GSRender.h" />
    <ClInclude Include="Emu\RSX\Null\NullGSRender.h" />
    <ClInclude Include="Emu\RSX\RSXFragmentProgram.h" />
@ -569,110 +587,25 @@
    <ClInclude Include="Emu\Memory\vm_var.h" />
    <ClInclude Include="Emu\RSX\rsx_methods.h" />
    <ClInclude Include="Emu\RSX\rsx_utils.h" />
    <ClInclude Include="Emu\state.h" />
    <ClInclude Include="Emu\SysCalls\Callback.h" />
    <ClInclude Include="Emu\SysCalls\CB_FUNC.h" />
    <ClInclude Include="Emu\SysCalls\ErrorCodes.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_sync.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_cond.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_dbg.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_event.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_event_flag.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_fs.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_interrupt.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_lwcond.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_lwmutex.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_memory.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_mmapper.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_mutex.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_ppu_thread.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_process.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_prx.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_rsx.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_rwlock.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_semaphore.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_spu.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_time.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_timer.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_trace.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_tty.h" />
    <ClInclude Include="Emu\SysCalls\lv2\sys_vm.h" />
    <ClInclude Include="Emu\SysCalls\ModuleManager.h" />
    <ClInclude Include="Emu\SysCalls\Modules.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellAdec.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellAtrac.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellAtracMulti.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellAudio.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellAudioIn.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellAudioOut.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellCamera.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellDmux.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellFiber.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellFont.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellFontFT.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellFs.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellGame.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellGcmSys.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellGem.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellGifDec.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellJpgDec.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellL10n.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellMic.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellMsgDialog.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellMusic.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellNetCtl.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellPad.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellPamf.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellPng.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellPngDec.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellResc.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellRtc.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellRudp.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSail.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellScreenshot.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSearch.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSpurs.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSpursJq.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSubdisplay.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSync.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSync2.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSysutil.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSaveData.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellSysutilAvc2.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellUsbd.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellUserInfo.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellVdec.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellVideoOut.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellVpost.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellWebBrowser.h" />
    <ClInclude Include="Emu\SysCalls\Modules\libmixer.h" />
    <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h" />
    <ClInclude Include="Emu\SysCalls\Modules\libsynth2.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNp.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNp2.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellKb.h" />
    <ClInclude Include="Emu\SysCalls\Modules\cellMouse.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sceNpUtil.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sysPrxForUser.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sys_lv2dbg.h" />
    <ClInclude Include="Emu\SysCalls\Modules\sys_net.h" />
    <ClInclude Include="Emu\SysCalls\SC_FUNC.h" />
    <ClInclude Include="Emu\SysCalls\SysCalls.h" />
    <ClInclude Include="Emu\System.h" />
-    <ClInclude Include="Loader\ELF32.h" />
+    <ClInclude Include="Loader\ELF.h" />
    <ClInclude Include="Loader\ELF64.h" />
    <ClInclude Include="Loader\Loader.h" />
    <ClInclude Include="Loader\PSF.h" />
    <ClInclude Include="Loader\TROPUSR.h" />
    <ClInclude Include="Loader\TRP.h" />
    <ClInclude Include="restore_new.h" />
    <ClInclude Include="stdafx.h" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\3rdparty\libpng\projects\vstudio\libpng\libpng.vcxproj">
      <Project>{d6973076-9317-4ef2-a0b8-b7a18ac0713e}</Project>
    </ProjectReference>
    <ProjectReference Include="..\asmjitsrc\asmjit.vcxproj">
      <Project>{ac40ff01-426e-4838-a317-66354cefae88}</Project>
    </ProjectReference>
    <ProjectReference Include="..\Utilities\yaml-cpp.vcxproj">
      <Project>{fdc361c5-7734-493b-8cfb-037308b35122}</Project>
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="UserMacros" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@ -87,11 +87,8 @@
      <Command>%windir%\sysnative\cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd"</Command>
      <Message>Updating git-version.h</Message>
    </PreBuildEvent>
    <ProjectReference>
      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    </ProjectReference>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\3rdparty\XAudio2_7;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\wxWidgets\include\msvc;..\wxWidgets\include;..\3rdparty\XAudio2_7;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -99,56 +96,60 @@
      <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalLibraryDirectories>..\wxWidgets\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalDependencies>VKstatic.1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <BaseAddress>0x10000</BaseAddress>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>true</DataExecutionPrevention>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" />
+    <ClCompile Include="BasicKeyboardHandler.cpp" />
-    <ClCompile Include="Emu\Io\XInput\XInputPadHandler.cpp" />
+    <ClCompile Include="BasicMouseHandler.cpp" />
    <ClCompile Include="Gui\AutoPauseManager.cpp" />
    <ClCompile Include="Gui\CgDisasm.cpp" />
    <ClCompile Include="Gui\CompilerELF.cpp" />
    <ClCompile Include="Gui\ConLogFrame.cpp" />
    <ClCompile Include="Gui\Debugger.cpp" />
-    <ClCompile Include="Gui\DisAsmFrame.cpp" />
+    <ClCompile Include="Gui\FrameBase.cpp" />
    <ClCompile Include="Gui\GameViewer.cpp" />
    <ClCompile Include="Gui\GLGSFrame.cpp" />
    <ClCompile Include="Gui\GSFrame.cpp" />
    <ClCompile Include="Gui\InstructionEditor.cpp" />
    <ClCompile Include="Gui\InterpreterDisAsm.cpp" />
    <ClCompile Include="Gui\KernelExplorer.cpp" />
    <ClCompile Include="Gui\LLEModulesManager.cpp" />
    <ClCompile Include="Gui\MainFrame.cpp" />
    <ClCompile Include="Gui\MemoryStringSearcher.cpp" />
    <ClCompile Include="Gui\MemoryViewer.cpp" />
    <ClCompile Include="Gui\MsgDialog.cpp" />
    <ClCompile Include="Gui\PADManager.cpp" />
    <ClCompile Include="Gui\RegisterEditor.cpp" />
    <ClCompile Include="Gui\RSXDebugger.cpp" />
    <ClCompile Include="Gui\SaveDataDialog.cpp" />
    <ClCompile Include="Gui\SaveDataUtility.cpp" />
    <ClCompile Include="Gui\SettingsDialog.cpp" />
    <ClCompile Include="Gui\SignInDialog.cpp" />
    <ClCompile Include="Gui\TextInputDialog.cpp" />
-    <ClCompile Include="Gui\VFSManager.cpp" />
+    <ClCompile Include="KeyboardPadHandler.cpp" />
    <ClCompile Include="Gui\VHDDManager.cpp" />
    <ClCompile Include="rpcs3.cpp" />
    <ClCompile Include="XInputPadHandler.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="rpcs3.rc" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\Utilities\MTProgressDialog.h" />
    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h" />
    <ClInclude Include="Emu\Io\Windows\WindowsKeyboardHandler.h" />
    <ClInclude Include="Emu\Io\Windows\WindowsMouseHandler.h" />
    <ClInclude Include="Emu\Io\Windows\WindowsPadHandler.h" />
    <ClInclude Include="Emu\Io\XInput\XInputPadHandler.h" />
    <ClInclude Include="Gui\AboutDialog.h" />
    <ClInclude Include="Gui\AutoPauseManager.h" />
    <ClInclude Include="Gui\CgDisasm.h" />
    <ClInclude Include="Gui\CompilerELF.h" />
    <ClInclude Include="Gui\ConLogFrame.h" />
    <ClInclude Include="Gui\Debugger.h" />
    <ClInclude Include="Gui\DisAsmFrame.h" />
    <ClInclude Include="Gui\FrameBase.h" />
    <ClInclude Include="Gui\GameViewer.h" />
    <ClInclude Include="Gui\GLGSFrame.h" />
@ -156,7 +157,6 @@
    <ClInclude Include="Gui\InstructionEditor.h" />
    <ClInclude Include="Gui\InterpreterDisAsm.h" />
    <ClInclude Include="Gui\KernelExplorer.h" />
    <ClInclude Include="Gui\LLEModulesManager.h" />
    <ClInclude Include="Gui\MainFrame.h" />
    <ClInclude Include="Gui\MemoryStringSearcher.h" />
    <ClInclude Include="Gui\MemoryViewer.h" />
@ -169,11 +169,13 @@
    <ClInclude Include="Gui\SettingsDialog.h" />
    <ClInclude Include="Gui\SignInDialog.h" />
    <ClInclude Include="Gui\TextInputDialog.h" />
-    <ClInclude Include="Gui\VFSManager.h" />
+    <ClInclude Include="KeyboardPadHandler.h" />
    <ClInclude Include="Gui\VHDDManager.h" />
    <ClInclude Include="resource.h" />
    <ClInclude Include="rpcs3.h" />
    <ClInclude Include="stdafx_gui.h" />
    <ClInclude Include="BasicKeyboardHandler.h" />
    <ClInclude Include="BasicMouseHandler.h" />
    <ClInclude Include="XInputPadHandler.h" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="D3D12GSRender.vcxproj">
@ -188,9 +190,6 @@
    <ProjectReference Include="OpenAL.vcxproj">
      <Project>{30a05c4d-f5fd-421c-a864-17a64bdeaa75}</Project>
    </ProjectReference>
    <ProjectReference Include="PPULLVMRecompiler.vcxproj">
      <Project>{304a6e8b-a311-4ec5-8045-bfa8d08175ce}</Project>
    </ProjectReference>
    <ProjectReference Include="VKGSRender.vcxproj">
      <Project>{3ee5f075-b546-42c4-b6a8-e3ccef38b78d}</Project>
    </ProjectReference>
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@ -10,15 +10,15 @@
    <Filter Include="Io">
      <UniqueIdentifier>{6da015d7-ee99-4d6b-9588-42414b63ee0e}</UniqueIdentifier>
    </Filter>
    <Filter Include="Io\Windows">
      <UniqueIdentifier>{ce9ce942-07dd-4cbc-9b76-0f754c363eda}</UniqueIdentifier>
    </Filter>
    <Filter Include="Io\XInput">
      <UniqueIdentifier>{b30572ce-b602-4c10-ad69-bd3f1c8a0144}</UniqueIdentifier>
    </Filter>
    <Filter Include="rpcs3">
      <UniqueIdentifier>{47155d25-741d-42c0-8850-f22aafca082a}</UniqueIdentifier>
    </Filter>
    <Filter Include="Io\Basic">
      <UniqueIdentifier>{ce9ce942-07dd-4cbc-9b76-0f754c363eda}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="rpcs3.cpp">
@ -30,12 +30,6 @@
    <ClCompile Include="Gui\MemoryViewer.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\DisAsmFrame.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\CompilerELF.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\InterpreterDisAsm.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
@ -45,12 +39,6 @@
    <ClCompile Include="Gui\Debugger.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\VHDDManager.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\VFSManager.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\TextInputDialog.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
@ -78,18 +66,9 @@
    <ClCompile Include="Gui\KernelExplorer.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Emu\Io\XInput\XInputPadHandler.cpp">
      <Filter>Io\XInput</Filter>
    </ClCompile>
    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\MsgDialog.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\LLEModulesManager.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\MemoryStringSearcher.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
@ -105,6 +84,27 @@
    <ClCompile Include="Gui\SignInDialog.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\FrameBase.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="KeyboardPadHandler.cpp">
      <Filter>Io\Basic</Filter>
    </ClCompile>
    <ClCompile Include="XInputPadHandler.cpp">
      <Filter>Io\XInput</Filter>
    </ClCompile>
    <ClCompile Include="BasicKeyboardHandler.cpp">
      <Filter>Io\Basic</Filter>
    </ClCompile>
    <ClCompile Include="BasicMouseHandler.cpp">
      <Filter>Io\Basic</Filter>
    </ClCompile>
    <ClCompile Include="Gui\RegisterEditor.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
    <ClCompile Include="Gui\InstructionEditor.cpp">
      <Filter>Gui</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="rpcs3.rc" />
@ -113,15 +113,9 @@
    <ClInclude Include="..\Utilities\MTProgressDialog.h">
      <Filter>Utilities</Filter>
    </ClInclude>
    <ClInclude Include="Gui\CompilerELF.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\Debugger.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\DisAsmFrame.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\GameViewer.h">
      <Filter>Gui</Filter>
    </ClInclude>
@ -140,12 +134,6 @@
    <ClInclude Include="Gui\TextInputDialog.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\VFSManager.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\VHDDManager.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="rpcs3.h">
      <Filter>rpcs3</Filter>
    </ClInclude>
@ -176,33 +164,15 @@
    <ClInclude Include="Gui\KernelExplorer.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Emu\Io\Windows\WindowsKeyboardHandler.h">
      <Filter>Io\Windows</Filter>
    </ClInclude>
    <ClInclude Include="Emu\Io\Windows\WindowsMouseHandler.h">
      <Filter>Io\Windows</Filter>
    </ClInclude>
    <ClInclude Include="Emu\Io\Windows\WindowsPadHandler.h">
      <Filter>Io\Windows</Filter>
    </ClInclude>
    <ClInclude Include="Emu\Io\XInput\XInputPadHandler.h">
      <Filter>Io\XInput</Filter>
    </ClInclude>
    <ClInclude Include="stdafx_gui.h">
      <Filter>rpcs3</Filter>
    </ClInclude>
    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\MsgDialog.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\InstructionEditor.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\LLEModulesManager.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="Gui\CgDisasm.h">
      <Filter>Gui</Filter>
    </ClInclude>
@ -222,6 +192,18 @@
    <ClInclude Include="Gui\PADManager.h">
      <Filter>Gui</Filter>
    </ClInclude>
    <ClInclude Include="XInputPadHandler.h">
      <Filter>Io\XInput</Filter>
    </ClInclude>
    <ClInclude Include="KeyboardPadHandler.h">
      <Filter>Io\Basic</Filter>
    </ClInclude>
    <ClInclude Include="BasicKeyboardHandler.h">
      <Filter>Io\Basic</Filter>
    </ClInclude>
    <ClInclude Include="BasicMouseHandler.h">
      <Filter>Io\Basic</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Image Include="rpcs3.ico" />
--- a/rpcs3/rpcs3qt/glviewer.cpp
+++ b/rpcs3/rpcs3qt/glviewer.cpp
@ -1,3 +1,4 @@
 #ifdef QT_UI
 #include "glviewer.h"
 #include <QQuickWindow>
 #include <QOpenGLContext>
@ -53,4 +54,4 @@ void GLViewer::cleanup() {
 		m_renderer = 0;
 	}
 }
-
+#endif
--- a/rpcs3/rpcs3qt/main.cpp
+++ b/rpcs3/rpcs3qt/main.cpp
@ -1,5 +1,6 @@
 // Qt5.2+ frontend implementation for rpcs3. Known to work on Windows, Linux, Mac
 // by Sacha Refshauge
 #ifdef QT_UI
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include "glviewer.h"
@ -14,3 +15,4 @@ int main(int argc, char *argv[])
 	return app.exec();
 	Q_UNUSED(engine)
 }
 #endif
--- a/rpcs3/stdafx.cpp
+++ b/rpcs3/stdafx.cpp
@ -1,9 +1 @@
 #include "stdafx.h"
 #ifdef _MSC_VER
 #pragma comment(lib, "avcodec.lib")
 #pragma comment(lib, "avformat.lib")
 #pragma comment(lib, "avutil.lib")
 #pragma comment(lib, "swresample.lib")
 #pragma comment(lib, "swscale.lib")
 #endif
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@ -20,192 +20,46 @@
 #pragma warning( disable : 4351 )
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
 #include <cstdint>
 #include <climits>
 #include <cmath>
 #include <cerrno>
-#include <atomic>
+#include <string>
 #include <mutex>
 #include <thread>
 #include <condition_variable>
 #include <memory>
 #include <vector>
 #include <queue>
 #include <set>
 #include <array>
 #include <string>
 #include <functional>
 #include <algorithm>
 #include <random>
 #include <unordered_set>
 #include <map>
 #include <unordered_map>
 #include <list>
 #include <forward_list>
 #include <typeindex>
 #include <future>
 #include <chrono>
 #include "Utilities/types.h"
 #include <restore_new.h>
 #define GSL_THROW_ON_CONTRACT_VIOLATION
 #include <gsl.h>
 #include <define_new_memleakdetect.h>
 #undef Expects
 #undef Ensures
 using namespace std::string_literals;
 using namespace std::chrono_literals;
-#include "Utilities/GNU.h"
+// Obsolete, throw fmt::exception directly. Use 'HERE' macro, if necessary.
-
+#define EXCEPTION(format_str, ...) fmt::exception("%s(): " format_str HERE, __FUNCTION__, ##__VA_ARGS__)
 #define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " type size")
 #define CHECK_ALIGN(type, align) static_assert(alignof(type) == align, "Invalid " #type " type alignment")
 #define CHECK_MAX_SIZE(type, size) static_assert(sizeof(type) <= size, #type " type size is too big")
 #define CHECK_SIZE_ALIGN(type, size, align) CHECK_SIZE(type, size); CHECK_ALIGN(type, align)
 #define CHECK_ASCENDING(constexpr_array) static_assert(::is_ascending(constexpr_array), #constexpr_array " is not sorted in ascending order")
 #ifndef _MSC_VER
 using u128 = __uint128_t;
 #endif
 CHECK_SIZE_ALIGN(u128, 16, 16);
 #include "Utilities/types.h"
 // bool type replacement for PS3/PSV
 class b8
 {
 	std::uint8_t m_value;
 public:
 	b8(const bool value)
 		: m_value(value)
 	{
 	}
 	operator bool() const
 	{
 		return m_value != 0;
 	}
 };
 CHECK_SIZE_ALIGN(b8, 1, 1);
 template<typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
 inline T align(const T& value, u64 align)
 {
 	return static_cast<T>((value + (align - 1)) & ~(align - 1));
 }
 // copy null-terminated string from std::string to char array with truncation
 template<std::size_t N>
 inline void strcpy_trunc(char(&dst)[N], const std::string& src)
 {
 	const std::size_t count = src.size() >= N ? N - 1 : src.size();
 	std::memcpy(dst, src.c_str(), count);
 	dst[count] = '\0';
 }
 // copy null-terminated string from char array to char array with truncation
 template<std::size_t N, std::size_t N2>
 inline void strcpy_trunc(char(&dst)[N], const char(&src)[N2])
 {
 	const std::size_t count = N2 >= N ? N - 1 : N2;
 	std::memcpy(dst, src, count);
 	dst[count] = '\0';
 }
 // returns true if all array elements are unique and sorted in ascending order
 template<typename T, std::size_t N>
 constexpr bool is_ascending(const T(&array)[N], std::size_t from = 0)
 {
 	return from >= N - 1 ? true : array[from] < array[from + 1] ? is_ascending(array, from + 1) : false;
 }
 // get (first) array element equal to `value` or nullptr if not found
 template<typename T, std::size_t N, typename T2>
 constexpr const T* static_search(const T(&array)[N], const T2& value, std::size_t from = 0)
 {
 	return from >= N ? nullptr : array[from] == value ? array + from : static_search(array, value, from + 1);
 }
 // bool wrapper for restricting bool result conversions
 struct explicit_bool_t
 {
 	const bool value;
 	constexpr explicit_bool_t(bool value)
 		: value(value)
 	{
 	}
 	explicit constexpr operator bool() const
 	{
 		return value;
 	}
 };
 template<typename T1, typename T2, typename T3 = const char*>
 struct triplet_t
 {
 	T1 first;
 	T2 second;
 	T3 third;
 	constexpr bool operator ==(const T1& right) const
 	{
 		return first == right;
 	}
 };
 // return 32 bit sizeof() to avoid widening/narrowing conversions with size_t
 #define SIZE_32(type) static_cast<u32>(sizeof(type))
 // return 32 bit alignof() to avoid widening/narrowing conversions with size_t
 #define ALIGN_32(type) static_cast<u32>(alignof(type))
 // return 32 bit .size() for container
 template<typename T>
 inline auto size32(const T& container) -> decltype(static_cast<u32>(container.size()))
 {
 	const auto size = container.size();
 	return size >= 0 && size <= UINT32_MAX ? static_cast<u32>(size) : throw std::length_error(__FUNCTION__);
 }
 // return 32 bit size for an array
 template<typename T, std::size_t Size>
 constexpr u32 size32(const T(&)[Size])
 {
 	return Size >= 0 && Size <= UINT32_MAX ? static_cast<u32>(Size) : throw std::length_error(__FUNCTION__);
 }
 // return 32 bit offsetof()
 #define OFFSET_32(type, x) static_cast<u32>(reinterpret_cast<uintptr_t>(&reinterpret_cast<char const volatile&>(reinterpret_cast<type*>(0ull)->x)))
 #define CONCATENATE_DETAIL(x, y) x ## y
 #define CONCATENATE(x, y) CONCATENATE_DETAIL(x, y)
 #define SWITCH(expr) for (const auto& CONCATENATE(_switch_, __LINE__) = (expr);;) { const auto& _switch_ = CONCATENATE(_switch_, __LINE__);
 #define CCASE(value) } constexpr std::remove_reference_t<decltype(_switch_)> CONCATENATE(_value_, __LINE__) = value; if (_switch_ == CONCATENATE(_value_, __LINE__)) {
 #define VCASE(value) } if (_switch_ == (value)) {
 #define DEFAULT      } /* must be the last one */
 #define WRAP_EXPR(expr) [&]{ return expr; }
 #define COPY_EXPR(expr) [=]{ return expr; }
 #define PURE_EXPR(expr) [] { return expr; }
 #define EXCEPTION(text, ...) fmt::exception(__FILE__, __LINE__, __FUNCTION__, text, ##__VA_ARGS__)
 #define VM_CAST(value) vm::impl_cast(value, __FILE__, __LINE__, __FUNCTION__)
 #define IS_INTEGRAL(t) (std::is_integral<t>::value || std::is_same<std::decay_t<t>, u128>::value)
 #define IS_INTEGER(t) (std::is_integral<t>::value || std::is_enum<t>::value || std::is_same<std::decay_t<t>, u128>::value)
 #define IS_BINARY_COMPARABLE(t1, t2) (IS_INTEGER(t1) && IS_INTEGER(t2) && sizeof(t1) == sizeof(t2))
 #define CHECK_ASSERTION(expr) if (expr) {} else throw EXCEPTION("Assertion failed: %s", #expr)
 #define CHECK_SUCCESS(expr) if (s32 _r = (expr)) throw EXCEPTION("Failure: %s -> 0x%x", #expr, _r)
 // Some forward declarations for the ID manager
 template<typename T> struct id_traits;
 #define _PRGNAME_ "RPCS3"
-#define _PRGVER_ "0.0.0.6"
+#define _PRGVER_ "0.0.0.9"
 #include "Utilities/Macro.h"
 #include "Utilities/Platform.h"
 #include "Utilities/BEType.h"
 #include "Utilities/Atomic.h"
 #include "Utilities/StrFmt.h"
--- a/rpcs3/stdafx_d3d12.h
+++ b/rpcs3/stdafx_d3d12.h
@ -6,9 +6,9 @@
 #include <d3dcompiler.h>
 #include <d3d12.h>
-#include "Emu\RSX\D3D12\D3D12Utils.h"
+#include "Emu/RSX/D3D12/D3D12Utils.h"
-#include "Emu\RSX\D3D12\D3D12Formats.h"
+#include "Emu/RSX/D3D12/D3D12Formats.h"
-#include "Emu\RSX\D3D12\D3D12GSRender.h"
+#include "Emu/RSX/D3D12/D3D12GSRender.h"
 #pragma comment(lib, "d2d1")
 #pragma comment(lib, "DXGI")
--- a/rpcs3/stdafx_gui.h
+++ b/rpcs3/stdafx_gui.h
@ -2,8 +2,6 @@
 #include "restore_new.h"
 #ifndef QT_UI
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #else
@ -49,6 +47,28 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #endif
 #include "define_new_memleakdetect.h"
 namespace fmt
 {
 	// Convert a null-terminated wxString to a std::string encoded in utf8
 	inline std::string ToUTF8(const wxString& right)
 	{
 		return static_cast<const char*>(right.utf8_str());
 	}
 	// Convert a null-terminated std::string encoded in utf8 to a wxString
 	inline wxString FromUTF8(const std::string& right)
 	{
 		return wxString::FromUTF8(right.c_str());
 	}
 }
 #include "yaml-cpp/yaml.h"
 // Global GUI config
 extern YAML::Node g_gui_cfg;
 // Save global GUI config
 extern void save_gui_cfg();
--- a/rpcs3_debug.props
+++ b/rpcs3_debug.props
@ -12,9 +12,6 @@
      <Optimization>Disabled</Optimization>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    </ClCompile>
    <Link>
      <AdditionalDependencies>wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
 </Project>
--- a/rpcs3_default.props
+++ b/rpcs3_default.props
@ -3,7 +3,7 @@
  <ImportGroup Label="PropertySheets" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\wxWidgets\src\zlib;..\3rdparty\ffmpeg\WindowsInclude;..\3rdparty\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\3rdparty\glm;..\3rdparty\GSL\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src</IncludePath>
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\Utilities\yaml-cpp\include;..\wxWidgets\src\zlib;..\3rdparty\ffmpeg\WindowsInclude;..\3rdparty\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\3rdparty\GSL\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src</IncludePath>
    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
    <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
@ -17,19 +17,11 @@
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>false</SDLCheck>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration).pch</PrecompiledHeaderOutputFile>
      <ProgramDataBaseFileName>$(Platform)\$(Configuration).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>ws2_32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\3rdparty\ffmpeg\Windows\x86_64\lib</AdditionalLibraryDirectories>
      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <DataExecutionPrevention>true</DataExecutionPrevention>
      <AdditionalLibraryDirectories>..\wxWidgets\lib\vc_x64_lib;..\3rdparty\ffmpeg\Windows\x86_64\lib;..\lib\</AdditionalLibraryDirectories>
      <BaseAddress>0x10000</BaseAddress>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
--- a/rpcs3_release.props
+++ b/rpcs3_release.props
@ -12,7 +12,6 @@
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    </ClCompile>
    <Link>
      <AdditionalDependencies>wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
    </Link>