diff --git a/.gitignore b/.gitignore index fd1fc23a7f..8e4a5a536c 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,7 @@ rpcs3/git-version.h # Visual Studio Files .vs/* +*.ipch *.vspx *.psess *.VC.* diff --git a/.gitmodules b/.gitmodules index 3216038e4c..ca91686dae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,7 +14,7 @@ url = https://github.com/Microsoft/GSL.git [submodule "libpng"] path = 3rdparty/libpng - url = https://github.com/RPCS3/libpng + url = https://github.com/Zangetsu38/libpng ignore = dirty [submodule "Vulkan/glslang"] path = Vulkan/glslang @@ -33,7 +33,7 @@ url = https://github.com/madler/zlib [submodule "3rdparty/hidapi"] path = 3rdparty/hidapi - url = https://github.com/RPCS3/hidapi + url = https://github.com/Zangetsu38/hidapi branch = master [submodule "3rdparty/Optional"] path = 3rdparty/Optional diff --git a/3rdparty/hidapi b/3rdparty/hidapi index ca39ce8939..4c2750112e 160000 --- a/3rdparty/hidapi +++ b/3rdparty/hidapi @@ -1 +1 @@ -Subproject commit ca39ce8939e490ffcadb38ff978447aac1c17662 +Subproject commit 4c2750112e89bf579e7752285ad56e69d15549df diff --git a/3rdparty/libpng b/3rdparty/libpng index 1dcba4d6eb..bbbcaf1122 160000 --- a/3rdparty/libpng +++ b/3rdparty/libpng @@ -1 +1 @@ -Subproject commit 1dcba4d6eb1bad9500be877cbd1b0442fa92cfa6 +Subproject commit bbbcaf112213b3a7625e728365a4be462565b2cf diff --git a/README.md b/README.md index 7f7566e4d1..7b3ddc3e1f 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ If you want to contribute please take a look at the [Coding Style](https://githu ## Dependencies ### Windows -* [Visual Studio 2015](https://www.visualstudio.com/vs/older-downloads/) -* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145) +* [Visual Studio 2017](https://www.visualstudio.com/en/downloads/) +* [Visual C++ Redistributable Packages for Visual Studio 2017](https://go.microsoft.com/fwlink/?LinkId=746572) * [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH) * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH) -* [Qt 5.8+](https://www.qt.io/download-open-source/) (required; add QTDIR `\5.8\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin) +* [Qt 5.9.3](https://www.qt.io/download-open-source/) (required; add QTDIR `\5.9.3\msvc2017_64\` environment variable if you do not want to use the Visual Studio Qt Plugin) * [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2015) (optional; see above) ### Linux @@ -48,14 +48,14 @@ To initialize the repository don't forget to execute `git submodule update --ini ### Configuring Qt *If you're using Visual Studio 2017 without Qt plugin support (or simply dont want to use it):* -1) Add `QTDIR` environment variable and set it to `\5.8\msvc2015_64\`
+1) Add `QTDIR` environment variable and set it to `\5.9.3\msvc2017_64\`
Open `rpcs3.sln` *If you wish to use the Visual Studio plugin for Qt:*
-1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.8\msvc2015_64`.
+1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.9.3\msvc2017_64`.
2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. ### Building the projects diff --git a/Utilities/yaml-cpp.vcxproj b/Utilities/yaml-cpp.vcxproj index be1458a48e..41b50e99c1 100644 --- a/Utilities/yaml-cpp.vcxproj +++ b/Utilities/yaml-cpp.vcxproj @@ -19,7 +19,7 @@ StaticLibrary Unicode - v140 + v141 diff --git a/Vulkan/Vulkan-build/Vulkan-build.vcxproj b/Vulkan/Vulkan-build/Vulkan-build.vcxproj index d2306790e8..e3cdaf2c38 100644 --- a/Vulkan/Vulkan-build/Vulkan-build.vcxproj +++ b/Vulkan/Vulkan-build/Vulkan-build.vcxproj @@ -19,12 +19,12 @@ Makefile true - v140 + v141 Makefile false - v140 + v141 @@ -40,23 +40,23 @@ start /W /B pre-build.bat -cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers +cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m start /W /B pre-build.bat -cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers +cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m start /W /B pre-build.bat -cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers +cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m start /W /B pre-build.bat -cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers +cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m diff --git a/Vulkan/glslang-build/glslang-build.vcxproj b/Vulkan/glslang-build/glslang-build.vcxproj index 8fb53b7ca8..6d196e5269 100644 --- a/Vulkan/glslang-build/glslang-build.vcxproj +++ b/Vulkan/glslang-build/glslang-build.vcxproj @@ -19,12 +19,12 @@ Makefile true - v140 + v141 Makefile false - v140 + v141 @@ -39,24 +39,24 @@ - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m diff --git a/appveyor.yml b/appveyor.yml index c75759ea54..889dcc6765 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,14 +10,14 @@ version: '0.0.4-{build}' #---------------------------------# # Build worker image (VM template) -image: Visual Studio 2015 +image: Visual Studio 2017 # clone directory clone_folder: c:\projects\rpcs3 # environment variables environment: - QTDIR: C:\Qt\5.9\msvc2015_64 + QTDIR: C:\Qt\5.9\msvc2017_64 # build cache to preserve files/folders between builds cache: diff --git a/asmjitsrc/asmjit.vcxproj b/asmjitsrc/asmjit.vcxproj index 95146d1d46..5697719d70 100644 --- a/asmjitsrc/asmjit.vcxproj +++ b/asmjitsrc/asmjit.vcxproj @@ -93,7 +93,7 @@ StaticLibrary Unicode - v140 + v141 diff --git a/llvm_build/llvm_build.vcxproj b/llvm_build/llvm_build.vcxproj index 7708880925..e70eb00e38 100644 --- a/llvm_build/llvm_build.vcxproj +++ b/llvm_build/llvm_build.vcxproj @@ -18,12 +18,12 @@ Makefile true - v140 + v141 Makefile false - v140 + v141 @@ -39,30 +39,30 @@ - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m diff --git a/rpcs3-tests/rpcs3-tests.vcxproj b/rpcs3-tests/rpcs3-tests.vcxproj index 2528730793..5a4a5f8a41 100644 --- a/rpcs3-tests/rpcs3-tests.vcxproj +++ b/rpcs3-tests/rpcs3-tests.vcxproj @@ -20,14 +20,14 @@ DynamicLibrary true - v140 + v141 Unicode false DynamicLibrary false - v140 + v141 true Unicode false diff --git a/rpcs3.sln b/rpcs3.sln index 1c17a89b66..357fbe886f 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.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2006 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}" EndProject @@ -243,4 +243,7 @@ Global {FDC361C5-7734-493B-8CFB-037308B35122} = {DDF904CA-2771-441A-8629-5DF2EB922A79} {A107C21C-418A-4697-BB10-20C3AA60E2E4} = {FA1E6C16-CA63-45F8-8D52-E21DF396BE36} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510} + EndGlobalSection EndGlobal diff --git a/rpcs3/D3D12GSRender.vcxproj b/rpcs3/D3D12GSRender.vcxproj index 238e7a664a..26e9400943 100644 --- a/rpcs3/D3D12GSRender.vcxproj +++ b/rpcs3/D3D12GSRender.vcxproj @@ -31,7 +31,7 @@ StaticLibrary Unicode - v140 + v141 diff --git a/rpcs3/Emu/Cell/PPUAnalyser.cpp b/rpcs3/Emu/Cell/PPUAnalyser.cpp index d73941fc32..9dd60c4ab7 100644 --- a/rpcs3/Emu/Cell/PPUAnalyser.cpp +++ b/rpcs3/Emu/Cell/PPUAnalyser.cpp @@ -1436,7 +1436,7 @@ void ppu_module::analyse(u32 lib_toc, u32 entry) void ppu_acontext::UNK(ppu_opcode_t op) { - std::fill_n(gpr, 32, spec_gpr{}); + std::fill_n(gpr, 32, spec_gpr()); LOG_ERROR(PPU, "Unknown/Illegal opcode: 0x%08x at 0x%x" HERE, op.opcode, cia); } @@ -2563,7 +2563,7 @@ void ppu_acontext::MULHW(ppu_opcode_t op) void ppu_acontext::LDARX(ppu_opcode_t op) { - gpr[op.rd] = {}; + gpr[op.rd] = spec_gpr(); } void ppu_acontext::DCBF(ppu_opcode_t op) @@ -2879,7 +2879,7 @@ void ppu_acontext::LVRX(ppu_opcode_t op) void ppu_acontext::LSWI(ppu_opcode_t op) { - std::fill_n(gpr, 32, spec_gpr{}); + std::fill_n(gpr, 32, spec_gpr()); } void ppu_acontext::LFSUX(ppu_opcode_t op) @@ -3106,7 +3106,7 @@ void ppu_acontext::STHU(ppu_opcode_t op) void ppu_acontext::LMW(ppu_opcode_t op) { - std::fill_n(gpr, 32, spec_gpr{}); + std::fill_n(gpr, 32, spec_gpr()); } void ppu_acontext::STMW(ppu_opcode_t op) diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj index c0922ab3fa..72a22875f3 100644 --- a/rpcs3/GLGSRender.vcxproj +++ b/rpcs3/GLGSRender.vcxproj @@ -31,7 +31,7 @@ StaticLibrary Unicode - v140 + v141 diff --git a/rpcs3/OpenAL.vcxproj b/rpcs3/OpenAL.vcxproj index 7dfff65312..557cba7ac1 100644 --- a/rpcs3/OpenAL.vcxproj +++ b/rpcs3/OpenAL.vcxproj @@ -31,7 +31,7 @@ StaticLibrary - v140 + v141 Unicode diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index 9eb0d7dcd4..099dd79968 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -62,7 +62,7 @@ StaticLibrary - v140 + v141 Unicode diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/XAudio.vcxproj index 723190d37e..921afab18f 100644 --- a/rpcs3/XAudio.vcxproj +++ b/rpcs3/XAudio.vcxproj @@ -31,7 +31,7 @@ StaticLibrary Unicode - v140 + v141 diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 25ef24c291..c8f7d277de 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -30,7 +30,7 @@ StaticLibrary - v140 + v141 Unicode diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index b55fde93fe..20d2435305 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -26,7 +26,7 @@ - v140 + v141 release\ false Unicode @@ -35,7 +35,7 @@ rpcs3 - v140 + v141 release\ false Unicode @@ -44,7 +44,7 @@ rpcs3 - v140 + v141 debug\ false Unicode @@ -53,7 +53,7 @@ rpcs3 - v140 + v141 debug\ false Unicode