diff --git a/.travis.yml b/.travis.yml index 6bb94decea..703ff4cf34 100644 --- 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 diff --git a/README.md b/README.md index 3d8efc9641..e6bdefceda 100644 --- 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`. diff --git a/appveyor.yml b/appveyor.yml index 65603cd216..8ce9345d6d 100644 --- 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/) diff --git a/rpcs3.sln b/rpcs3.sln index 180ae13212..89f3bf4ee3 100644 --- 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|x64 - {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.Build.0 = Debug|x64 - {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.Build.0 = Debug|x64 + {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 + {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 + {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 + {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|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}.DLL Debug|x64.Build.0 = Debug|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 - LLVM|x64.ActiveCfg = Release - LLVM|x64 + {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release - LLVM|x64.Build.0 = Release - LLVM|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} = {C8068CE9-D626-4FEA-BEE7-893F06A25BF3} + {8BC303AB-25BE-4276-8E57-73F171B2D672} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668} {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} - {8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {09AD61F7-97FE-4FF8-8F7F-63FEA9B746F4} + {58B40697-B15E-429E-B325-D52C28AEBCBF} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668} + {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 diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index acb109e08e..a84ea142f2 100644 --- 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}/config.cpp" -"${RPCS3_SRC_DIR}/stb_image.cpp" -"${RPCS3_SRC_DIR}/../Utilities/GNU.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/*" +"${RPCS3_SRC_DIR}/*.cpp" +"${RPCS3_SRC_DIR}/../Utilities/*.cpp" +"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*.cpp" +"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*.cpp" ) if(APPLE) @@ -224,4 +217,4 @@ else() endif() set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h") -cotire(rpcs3) \ No newline at end of file +cotire(rpcs3) diff --git a/rpcs3/D3D12GSRender.vcxproj b/rpcs3/D3D12GSRender.vcxproj index a610917e18..d1c7dcd40f 100644 --- a/rpcs3/D3D12GSRender.vcxproj +++ b/rpcs3/D3D12GSRender.vcxproj @@ -61,11 +61,6 @@ - - - true - - diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index f632daf5a2..023a74e01b 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -92,54 +92,9 @@ - - - - - Level3 - Disabled - _DEBUG;_LIB;%(PreprocessorDefinitions) - ..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) - true - - - Windows - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - - - + ..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) - true - - - - - ..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) - true - - - - - ..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) - true diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 1b29045549..0984a75514 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -58,103 +58,206 @@ - - - ..\llvm\include;..\llvm_build\include; - - - - - ..\llvm\include;..\llvm_build\include; - - - - - ..\llvm\include;..\llvm_build\include; - - - - - ..\llvm\include;..\llvm_build\include; - - - + + Use ..\llvm\include;..\llvm_build\include; - - - - - + + NotUsing + + + NotUsing + + - - - + + NotUsing + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - true - true - true - true - true - + - - true - true - true - true - true - + - - - - - - - - - - - - - - - - - + + NotUsing + + + NotUsing + + + NotUsing + NotUsing - + + NotUsing + - - + + NotUsing + @@ -217,168 +320,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - + + + $(IntDir)OldMemory.obj + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -393,14 +352,12 @@ - - - + - - + + @@ -410,7 +367,6 @@ - @@ -422,12 +378,12 @@ - - + + @@ -485,64 +441,127 @@ - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - - - - - - - - - - - - - - - - + - - - - @@ -556,7 +575,6 @@ - @@ -569,110 +587,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + {d6973076-9317-4ef2-a0b8-b7a18ac0713e} + + + {ac40ff01-426e-4838-a317-66354cefae88} + + + {fdc361c5-7734-493b-8cfb-037308b35122} + + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index a8b1e1e296..78b9808d91 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -15,21 +15,9 @@ {ad58328f-b041-41e0-ad17-dbad7d193051} - - {d79d0db9-c3fc-480a-9979-175b82ffecf7} - - - {269371f1-45b7-4ca9-a4a7-376e6e62a8ba} - - - {4317ac27-38e4-4f8d-9bac-496f9b00f615} - {1df5b438-f263-4ff4-9b86-a9ea368f2106} - - {b26b6b08-a8ce-4bb5-8339-c5352a23ce96} - {28902cf4-4fa6-428b-ab94-6b410fd5077f} @@ -51,15 +39,6 @@ {fcac6852-b45f-4cf2-afee-cf56bcea14e5} - - {13d20086-2188-425a-9856-0440fe6f79f2} - - - {93b1cff1-0158-4327-a437-e9abcac8d724} - - - {1d9e6fc4-9a79-4329-a8b5-081e24822aaa} - {6674e2ab-90cd-47de-a852-d21643ab18c2} @@ -75,6 +54,21 @@ {2a8841dc-bce0-41bb-9fcb-5bf1f8dda213} + + {93b1cff1-0158-4327-a437-e9abcac8d724} + + + {1d9e6fc4-9a79-4329-a8b5-081e24822aaa} + + + {13d20086-2188-425a-9856-0440fe6f79f2} + + + {269371f1-45b7-4ca9-a4a7-376e6e62a8ba} + + + {4317ac27-38e4-4f8d-9bac-496f9b00f615} + @@ -104,251 +98,23 @@ Emu - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\Io - - - Emu\Io - - - Emu\Io - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\HDD - - Emu\CPU\Cell - - - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell Emu\CPU - - Emu\CPU - - Emu\CPU\ARMv7 - - - Emu\Audio + Emu\ARMv7 Emu\Audio @@ -359,15 +125,6 @@ Emu\Memory - - Loader - - - Loader - - - Loader - Loader @@ -380,78 +137,9 @@ Utilities - - Emu\SysCalls - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - Utilities - - Emu\SysCalls\Modules - - - Emu\GPU\RSX - Emu\GPU\RSX @@ -464,242 +152,209 @@ Emu\GPU\RSX - - Emu\SysCalls\lv2 - Utilities - - Utilities - - - Utilities - Utilities Crypto - - Emu\SysCalls\Modules - - Emu\CPU\ARMv7 + Emu\ARMv7 - Emu\CPU\ARMv7 - - - Emu\CPU\ARMv7 + Emu\ARMv7 - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules Utilities - - Emu\SysCalls\Modules - - - Emu\CPU\ARMv7 - - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules - - - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules Emu\GPU\RSX - - Emu\SysCalls\Modules - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\Modules - - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell Utilities @@ -713,185 +368,20 @@ Emu\GPU\RSX\Common - - Emu\SysCalls\lv2 - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - Utilities - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu - - - Utilities - Utilities - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell - - - Utilities + Emu\Cell Emu\GPU\RSX\Common @@ -902,16 +392,6 @@ Emu\GPU\RSX\Null - - Utilities - - - - Emu - - - Emu - Emu\GPU\RSX @@ -933,6 +413,438 @@ Emu\GPU\RSX\Common + + Emu\Cell + + + Emu\Cell + + + Emu\ARMv7 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell + + + Emu\Cell + + + Emu\Cell + + + Emu\Cell\Modules + + + Emu\ARMv7 + + + Emu\ARMv7\Modules + + + Utilities + + + Emu + @@ -965,306 +877,78 @@ Emu - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\Io - Emu\Io - - Emu\Io - Emu\Io - - Emu\Io - Emu\Io - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\FS - - - Emu\HDD - - Emu\CPU\Cell - - - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell - - - Emu\CPU\Cell - - - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell - - - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell - - - Emu\CPU + Emu\Cell Emu\CPU - - Emu\CPU - Emu\CPU - - Emu\CPU - - - Emu\CPU\ARMv7 - - Emu\CPU\ARMv7 + Emu\ARMv7 - Emu\CPU\ARMv7 + Emu\ARMv7 - Emu\CPU\ARMv7 + Emu\ARMv7 - Emu\CPU\ARMv7 + Emu\ARMv7 Emu\Audio - - Emu\Audio - Emu\Memory Emu\Memory - - Loader - - - Loader - - - Loader - Loader @@ -1283,84 +967,15 @@ Utilities - - Emu\SysCalls - Emu - - Emu\SysCalls - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\lv2 - Utilities Emu\GPU\RSX\Null - - Emu\GPU\RSX - Emu\GPU\RSX @@ -1382,9 +997,6 @@ Emu\GPU\RSX - - Emu\SysCalls\lv2 - Utilities @@ -1400,18 +1012,9 @@ Emu\Io\Null - - Utilities - - - Utilities - Utilities - - Utilities - Loader @@ -1433,15 +1036,9 @@ Header Files - - Emu\SysCalls - Crypto - - Emu\CPU\ARMv7 - Utilities @@ -1451,65 +1048,32 @@ Emu\Audio - - Emu\SysCalls\Modules - - - Emu\CPU\ARMv7 - - Emu\CPU\ARMv7 + Emu\ARMv7 - Emu\CPU\ARMv7\Modules - - - Emu\CPU\ARMv7 + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\CPU\Cell - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\Modules - - - Emu\CPU\Cell + Emu\ARMv7\Modules Utilities @@ -1526,215 +1090,170 @@ Emu\GPU\RSX\Common - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules + Emu\ARMv7\Modules - Emu\CPU\ARMv7\Modules - - - Emu\CPU\ARMv7\Modules - - - Emu\SysCalls\lv2 - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules + Emu\ARMv7\Modules Utilities - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules - Utilities - - Emu\SysCalls\lv2 - - Emu\CPU\Cell + Emu\Cell Utilities - Emu\CPU\Cell + Emu\Cell - Emu\CPU\Cell - - - Emu\SysCalls\Modules - - - Emu\SysCalls\Modules + Emu\Cell Utilities @@ -1751,22 +1270,9 @@ Utilities - - Utilities - - - Utilities - Utilities - - - Emu - - - Emu - Utilities @@ -1779,11 +1285,308 @@ Emu\GPU\RSX\Common - - Header Files - Emu\GPU\RSX\Common + + Utilities + + + Utilities + + + Loader + + + Emu\ARMv7 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\lv2 + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell\Modules + + + Emu\Cell + + + Emu\Cell + + + Emu\Cell + + + Emu\Cell + + + Emu\ARMv7 + + + Emu\ARMv7 + + + Emu\ARMv7\Modules + + + Header Files + + + Utilities + + + Emu + \ No newline at end of file diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 838e6867bd..21b2611725 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -87,11 +87,8 @@ %windir%\sysnative\cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd" Updating git-version.h - - false - - ..\3rdparty\XAudio2_7;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) + ..\wxWidgets\include\msvc;..\wxWidgets\include;..\3rdparty\XAudio2_7;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) ..\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) @@ -99,56 +96,60 @@ ..\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) ..\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) ..\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) + ..\wxWidgets\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies) + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies) + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies) + wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies) + wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies) VKstatic.1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;%(AdditionalDependencies) + Windows + true + 0x10000 + false + true - - + + - - + + - + - - + + - - - - - - - @@ -156,7 +157,6 @@ - @@ -169,11 +169,13 @@ - - + + + + @@ -188,9 +190,6 @@ {30a05c4d-f5fd-421c-a864-17a64bdeaa75} - - {304a6e8b-a311-4ec5-8045-bfa8d08175ce} - {3ee5f075-b546-42c4-b6a8-e3ccef38b78d} diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index f4b9821357..efdd23231d 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -10,15 +10,15 @@ {6da015d7-ee99-4d6b-9588-42414b63ee0e} - - {ce9ce942-07dd-4cbc-9b76-0f754c363eda} - {b30572ce-b602-4c10-ad69-bd3f1c8a0144} {47155d25-741d-42c0-8850-f22aafca082a} + + {ce9ce942-07dd-4cbc-9b76-0f754c363eda} + @@ -30,12 +30,6 @@ Gui - - Gui - - - Gui - Gui @@ -45,12 +39,6 @@ Gui - - Gui - - - Gui - Gui @@ -78,18 +66,9 @@ Gui - - Io\XInput - - - Gui - Gui - - Gui - Gui @@ -105,6 +84,27 @@ Gui + + Gui + + + Io\Basic + + + Io\XInput + + + Io\Basic + + + Io\Basic + + + Gui + + + Gui + @@ -113,15 +113,9 @@ Utilities - - Gui - Gui - - Gui - Gui @@ -140,12 +134,6 @@ Gui - - Gui - - - Gui - rpcs3 @@ -176,33 +164,15 @@ Gui - - Io\Windows - - - Io\Windows - - - Io\Windows - - - Io\XInput - rpcs3 - - Gui - Gui Gui - - Gui - Gui @@ -222,6 +192,18 @@ Gui + + Io\XInput + + + Io\Basic + + + Io\Basic + + + Io\Basic + diff --git a/rpcs3/rpcs3qt/glviewer.cpp b/rpcs3/rpcs3qt/glviewer.cpp index f05546ef04..280b9a9fb0 100644 --- a/rpcs3/rpcs3qt/glviewer.cpp +++ b/rpcs3/rpcs3qt/glviewer.cpp @@ -1,3 +1,4 @@ +#ifdef QT_UI #include "glviewer.h" #include #include @@ -53,4 +54,4 @@ void GLViewer::cleanup() { m_renderer = 0; } } - +#endif diff --git a/rpcs3/rpcs3qt/main.cpp b/rpcs3/rpcs3qt/main.cpp index 5bc3c32cc9..97bd997c9b 100644 --- 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 #include #include "glviewer.h" @@ -14,3 +15,4 @@ int main(int argc, char *argv[]) return app.exec(); Q_UNUSED(engine) } +#endif diff --git a/rpcs3/stdafx.cpp b/rpcs3/stdafx.cpp index 1ce5959c46..fd4f341c7b 100644 --- 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 diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 3ebd3f0a83..726d8025de 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -20,192 +20,46 @@ #pragma warning( disable : 4351 ) #include +#include #include -#include #include #include #include #include -#include +#include #include #include #include #include #include -#include -#include #include -#include #include #include -#include #include -#include #include -#include -#include -#include -#include #include +#include "Utilities/types.h" + #include +#define GSL_THROW_ON_CONTRACT_VIOLATION #include #include +#undef Expects +#undef Ensures + using namespace std::string_literals; using namespace std::chrono_literals; -#include "Utilities/GNU.h" - -#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::value>> -inline T align(const T& value, u64 align) -{ - return static_cast((value + (align - 1)) & ~(align - 1)); -} - -// copy null-terminated string from std::string to char array with truncation -template -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 -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 -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 -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 -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(sizeof(type)) - -// return 32 bit alignof() to avoid widening/narrowing conversions with size_t -#define ALIGN_32(type) static_cast(alignof(type)) - -// return 32 bit .size() for container -template -inline auto size32(const T& container) -> decltype(static_cast(container.size())) -{ - const auto size = container.size(); - return size >= 0 && size <= UINT32_MAX ? static_cast(size) : throw std::length_error(__FUNCTION__); -} - -// return 32 bit size for an array -template -constexpr u32 size32(const T(&)[Size]) -{ - return Size >= 0 && Size <= UINT32_MAX ? static_cast(Size) : throw std::length_error(__FUNCTION__); -} - -// return 32 bit offsetof() -#define OFFSET_32(type, x) static_cast(reinterpret_cast(&reinterpret_cast(reinterpret_cast(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 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::value || std::is_same, u128>::value) -#define IS_INTEGER(t) (std::is_integral::value || std::is_enum::value || std::is_same, 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 struct id_traits; +// Obsolete, throw fmt::exception directly. Use 'HERE' macro, if necessary. +#define EXCEPTION(format_str, ...) fmt::exception("%s(): " format_str HERE, __FUNCTION__, ##__VA_ARGS__) #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" diff --git a/rpcs3/stdafx_d3d12.h b/rpcs3/stdafx_d3d12.h index 19f78b3671..7943cd42b9 100644 --- a/rpcs3/stdafx_d3d12.h +++ b/rpcs3/stdafx_d3d12.h @@ -6,9 +6,9 @@ #include #include -#include "Emu\RSX\D3D12\D3D12Utils.h" -#include "Emu\RSX\D3D12\D3D12Formats.h" -#include "Emu\RSX\D3D12\D3D12GSRender.h" +#include "Emu/RSX/D3D12/D3D12Utils.h" +#include "Emu/RSX/D3D12/D3D12Formats.h" +#include "Emu/RSX/D3D12/D3D12GSRender.h" #pragma comment(lib, "d2d1") #pragma comment(lib, "DXGI") diff --git a/rpcs3/stdafx_gui.h b/rpcs3/stdafx_gui.h index 158a599ba9..249bf765c4 100644 --- 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(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(); diff --git a/rpcs3_debug.props b/rpcs3_debug.props index c631bcd1a6..feeca7c633 100644 --- a/rpcs3_debug.props +++ b/rpcs3_debug.props @@ -12,9 +12,6 @@ Disabled MultiThreadedDebugDLL - - wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies) - \ No newline at end of file diff --git a/rpcs3_default.props b/rpcs3_default.props index 676f2ede1a..18c630eb11 100644 --- a/rpcs3_default.props +++ b/rpcs3_default.props @@ -3,7 +3,7 @@ - .\;..\;..\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 + .\;..\;..\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 $(SolutionDir)lib\$(Configuration)-$(Platform)\ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\ @@ -17,20 +17,12 @@ Level3 false true - Use - $(Platform)\$(Configuration).pch - $(Platform)\$(Configuration).pdb - /FS %(AdditionalOptions) + NotUsing - Windows - true - 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) - true - ..\wxWidgets\lib\vc_x64_lib;..\3rdparty\ffmpeg\Windows\x86_64\lib;..\lib\ - 0x10000 - false + ws2_32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib + ..\3rdparty\ffmpeg\Windows\x86_64\lib - \ No newline at end of file + diff --git a/rpcs3_release.props b/rpcs3_release.props index 73dcfcf2be..c8c37df680 100644 --- a/rpcs3_release.props +++ b/rpcs3_release.props @@ -12,7 +12,6 @@ MultiThreadedDLL - wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies) true true