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 0699984231..20653c55d1 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 3849a381f6..4dc547e65f 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.2](https://www.qt.io/download-open-source/) (required; add QTDIR `\5.9.1\msvc2015_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 @@ -47,14 +47,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.2\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.2\msvc2015_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 50850770b1..ec26bb04f8 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 @@ -39,20 +39,20 @@ - 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 - 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 - 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 - 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 294e41016e..11f3d8a335 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ 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 @@ -20,7 +20,7 @@ clone_depth: 3 # clone entire repository history if not defin # 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/CMakeLists.txt b/rpcs3/CMakeLists.txt index 0fbe6a1a44..d045cf0edc 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -3,28 +3,30 @@ cmake_minimum_required(VERSION 3.1) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules") set(RES_FILES "") set(CMAKE_CXX_STANDARD 14) -include(CheckCXXCompilerFlag) +include(CheckCCompilerFlag) # Qt section -find_package(Qt5 5.7 COMPONENTS Widgets) -if(WIN32) - find_package(Qt5 5.7 COMPONENTS WinExtras REQUIRED) - set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras) +find_package(Qt5 5.9 COMPONENTS Widgets) +if (WIN32) + find_package(Qt5WinExtras REQUIRED) + set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras) + include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS}) else() - find_package(Qt5 5.7 COMPONENTS DBus) - if(Qt5DBus_FOUND) + find_package(Qt5DBus) + if (Qt5DBus_FOUND) set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus) add_definitions(-DHAVE_QTDBUS) else() set(RPCS3_QT_LIBS Qt5::Widgets) endif() + include_directories(${Qt5Widgets_INCLUDE_DIRS}) endif() # Let's make sure we have Qt before we continue -if(NOT Qt5Widgets_FOUND) - if(Qt5Widgets_VERSION VERSION_LESS 5.7.0) - message("Minimum supported Qt5 version is 5.7! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") - if("${CMAKE_SYSTEM}" MATCHES "Linux") +if (NOT Qt5Widgets_FOUND) + if (Qt5Widgets_VERSION VERSION_LESS 5.9.0) + message("Minimum supported Qt5 version is 5.9! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") + if ("${CMAKE_SYSTEM}" MATCHES "Linux") message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt. If you're on Ubuntu or Linux Mint, there are PPAs you can use to install an up-to-date qt5 version. https://launchpad.net/~beineri/+archive/ubuntu/opt-qt592-xenial @@ -32,16 +34,17 @@ If you're on Ubuntu or Linux Mint, there are PPAs you can use to install an up-t just make sure to run source /opt/qt59/bin/qt59-env.sh before re-running cmake") - elseif(WIN32) + elseif(WIN32) message(FATAL_ERROR "You can download the latest version of Qt5 here: https://www.qt.io/download-open-source/") else() message(FATAL_ERROR "Look online for instructions on installing an up-to-date Qt5 on ${CMAKE_SYSTEM}.") endif() - endif() - - message("CMake was unable to find Qt5!") - if(WIN32) - message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.8\\msvc2017_64\\)") + + endif() + + message("CMake was unable to find Qt5!") + if (WIN32) + message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.9\\msvc2017_64\\)") elseif("${CMAKE_SYSTEM}" MATCHES "Linux") message(FATAL_ERROR "Make sure to install your distro's qt5 package!") else() @@ -54,16 +57,14 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) # To make UI files on cmake 3.7 or less work -if(CMAKE_VERION VERSION_LESS 3.8) - set(CMAKE_INCLUDE_CURRENT_DIR ON) -endif() +set(CMAKE_INCLUDE_CURRENT_DIR ON) -if(Qt5_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - if(UNIX) - # Cotire needs this set for some reason - set(CMAKE_CXX_COMPILE_OPTIONS_PIE -fPIC) - endif() +if (Qt5_POSITION_INDEPENDENT_CODE) + SET(CMAKE_POSITION_INDEPENDENT_CODE ON) + if(UNIX) + # Cotire needs this set for some reason + SET(CMAKE_CXX_COMPILE_OPTIONS_PIE -fPIC) + endif() endif() include(cotire) @@ -107,7 +108,7 @@ if(NOT MSVC) add_compile_options(-msse -msse2 -mcx16 -mssse3 -mrtm) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # This fixes 'some' of the st11range issues. See issue #2516 if(APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-image_base,0x10000 -Wl,-pagezero_size,0x10000") @@ -120,8 +121,8 @@ if(NOT MSVC) if(APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie") else() - CHECK_CXX_COMPILER_FLAG("-no-pie" HAS_NO_PIE) - CHECK_CXX_COMPILER_FLAG("-nopie" HAS_NOPIE) + CHECK_C_COMPILER_FLAG("-no-pie" HAS_NO_PIE) + CHECK_C_COMPILER_FLAG("-nopie" HAS_NOPIE) if(HAS_NO_PIE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie") @@ -129,7 +130,8 @@ if(NOT MSVC) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nopie") endif() endif() - + + find_package(GLEW REQUIRED) find_package(ZLIB REQUIRED) else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1") @@ -152,41 +154,41 @@ if(UNIX AND NOT APPLE) endif() if(NOT RPCS3_SRC_DIR) - set(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}) - message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}") + SET(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}) + Message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}") else() - message("-- Using Custom RPCS3_SRC_DIR=${RPCS3_SRC_DIR}") + Message("-- Using Custom RPCS3_SRC_DIR=${RPCS3_SRC_DIR}") endif() set(CMAKE_MODULE_PATH "${RPCS3_SRC_DIR}/cmake_modules") find_package(OpenGL REQUIRED) find_package(OpenAL REQUIRED) -if(NOT WITHOUT_LLVM) +if (NOT WITHOUT_LLVM) find_package(LLVM 4.0 CONFIG) - if(NOT LLVM_FOUND) - message("System LLVM was not found, LLVM will be built from the submodule.") + if (NOT LLVM_FOUND) + message("System LLVM was not found, LLVM will be built from the submodule.") - set(LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "") - option(LLVM_BUILD_RUNTIME OFF) - option(LLVM_BUILD_TOOLS OFF) - option(LLVM_INCLUDE_DOCS OFF) - option(LLVM_INCLUDE_EXAMPLES OFF) - option(LLVM_INCLUDE_TESTS OFF) - option(LLVM_INCLUDE_TOOLS OFF) - option(LLVM_INCLUDE_UTILS OFF) - option(WITH_POLLY OFF) + set(LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "") + option(LLVM_BUILD_RUNTIME OFF) + option(LLVM_BUILD_TOOLS OFF) + option(LLVM_INCLUDE_DOCS OFF) + option(LLVM_INCLUDE_EXAMPLES OFF) + option(LLVM_INCLUDE_TESTS OFF) + option(LLVM_INCLUDE_TOOLS OFF) + option(LLVM_INCLUDE_UTILS OFF) + option(WITH_POLLY OFF) - # LLVM needs to be built out-of-tree - add_subdirectory(../llvm ../llvm_build) - set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/../llvm_build/lib/cmake/llvm/") + # LLVM needs to be built out-of-tree + add_subdirectory(../llvm ../llvm_build) + set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/../llvm_build/lib/cmake/llvm/") - # now tries to find LLVM again - find_package(LLVM 4.0 CONFIG) - if(NOT LLVM_FOUND) - message(WARNING "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`") - endif() - endif() + # now tries to find LLVM again + find_package(LLVM 4.0 CONFIG) + if (NOT LLVM_FOUND) + message(WARNING "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`") + endif() + endif() endif() @@ -197,17 +199,18 @@ elseif(WIN32) else() set(PLATFORM_ARCH "linux/x86_64") option(USE_ALSA "ALSA audio backend" ON) - option(USE_PULSE "PulseAudio audio backend" ON) + option(USE_PULSE "PulseAudio audio backend" ON) option(USE_LIBEVDEV "libevdev-based joystick support" ON) option(USE_VULKAN "Vulkan render backend" ON) endif() if(USE_ALSA) - find_package(ALSA) + find_package(PkgConfig) + pkg_check_modules(ALSA alsa) if(ALSA_FOUND) add_definitions(-DHAVE_ALSA) include_directories(SYSTEM ${ALSA_INCLUDE_DIRS}) - list(APPEND ADDITIONAL_LIBS ${ALSA_LIBRARIES}) + list(APPEND ADDITIONAL_LIBS ${ALSA_LDFLAGS}) endif() endif() if(USE_PULSE) @@ -233,9 +236,6 @@ if(NOT WIN32 AND USE_VULKAN) if(VULKAN_FOUND) add_definitions(-DHAVE_VULKAN) list(APPEND ADDITIONAL_LIBS ${VULKAN_LIBRARY}) - if(VULKAN_PREBUILT) - list(APPEND ADDITIONAL_LIBS glslang HLSL OGLCompiler SPIRV OSDependent) - endif() else() message("WARNING! USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.") endif() @@ -262,6 +262,8 @@ else() endif() include_directories( +${GLEW_INCLUDE_DIR} +${ZLIB_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} ${LLVM_INCLUDE_DIRS} "${RPCS3_SRC_DIR}/../3rdparty/pugixml/src" @@ -290,17 +292,17 @@ if(WIN32) endif() if(NOT LLVM_FOUND) - message("LLVM 4.0 not found. RPCS3 will be compiled without LLVM support.") + Message("LLVM 4.0 not found. RPCS3 will be compiled without LLVM support.") else() add_definitions(${LLVM_DEFINITIONS}) add_definitions(-DLLVM_AVAILABLE) - if(CMAKE_BUILD_TYPE STREQUAL "Release") + if (CMAKE_BUILD_TYPE STREQUAL "Release") llvm_map_components_to_libnames(LLVM_LIBS core support executionengine object runtimedyld x86desc x86info scalaropts mcjit vectorize ipo x86codegen x86disassembler) else() llvm_map_components_to_libnames(LLVM_LIBS core support executionengine object runtimedyld x86desc x86info scalaropts mcjit vectorize ipo x86codegen x86disassembler mcdisassembler) endif() - if(NOT MSVC) + if (NOT MSVC) set_source_files_properties(${RPCS3_SRC_DIR}/../Utilities/JIT.cpp PROPERTIES COMPILE_FLAGS -fno-rtti) set_source_files_properties(${RPCS3_SRC_DIR}/Emu/Cell/PPUTranslator.cpp PROPERTIES COMPILE_FLAGS -fno-rtti) endif() @@ -319,7 +321,7 @@ if(NOT USE_SYSTEM_FFMPEG) endif() get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) -foreach (dir ${dirs}) +foreach(dir ${dirs}) message(STATUS "dir='${dir}'") endforeach() @@ -331,7 +333,7 @@ RPCS3_SRC "${RPCS3_SRC_DIR}/../asmjit/src/asmjit/*.cpp" ) -if(NOT WIN32 AND VULKAN_FOUND) +if (NOT WIN32 AND VULKAN_FOUND) # Compile glslang and SPIRV modules needed for glsl compilation file( GLOB_RECURSE @@ -343,25 +345,25 @@ if(NOT WIN32 AND VULKAN_FOUND) "${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp" ) - set(RPCS3_SRC ${RPCS3_SRC} ${UNIX_GLSLANG}) + set (RPCS3_SRC ${RPCS3_SRC} ${UNIX_GLSLANG}) endif() #File exclusion section if(NOT WIN32 AND NOT VULKAN_FOUND) - set(EXCLUDE_FILES "/RSX/VK/") + set (EXCLUDE_FILES "/RSX/VK/") endif() # Ignore autogenerated moc_* files if present -set(EXCLUDE_FILES ${EXCLUDE_FILES} "moc_") -set(EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc") -set(EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp") +set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_") +set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc") +set (EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp") foreach (TMP_PATH ${RPCS3_SRC}) foreach (EXCLUDE_PATH ${EXCLUDE_FILES}) - string(FIND ${TMP_PATH} ${EXCLUDE_PATH} EXCLUDE_FILE_FOUND) - if(NOT ${EXCLUDE_FILE_FOUND} EQUAL -1) - list(REMOVE_ITEM RPCS3_SRC ${TMP_PATH}) + string (FIND ${TMP_PATH} ${EXCLUDE_PATH} EXCLUDE_FILE_FOUND) + if (NOT ${EXCLUDE_FILE_FOUND} EQUAL -1) + list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH}) endif () endforeach(EXCLUDE_PATH) endforeach(TMP_PATH) @@ -370,29 +372,24 @@ endforeach(TMP_PATH) file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp" "${RPCS3_SRC_DIR}/qrc_resources.cpp") set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}") -if(WIN32) - add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc) +if (WIN32) + add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc) else() - add_executable(rpcs3 ${RPCS3_SRC} ${RES_FILES} resources.qrc) + add_executable(rpcs3 ${RPCS3_SRC} ${RES_FILES} resources.qrc) endif() add_dependencies(rpcs3 GitVersion) -if(NOT MSVC) - find_package(GLEW 1.13.0 REQUIRED) - target_link_libraries(rpcs3 GLEW::GLEW) -endif() - if(WIN32) target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib VKstatic.1 glslang OSDependent OGLCompiler SPIRV HLSL setupapi.lib hidapi-hid Shlwapi.lib) if(NOT MSVC) - target_link_libraries(rpcs3 ${OPENGL_LIBRARIES} opengl32.lib glu32.lib libpthread) + target_link_libraries(rpcs3 ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} opengl32.lib glu32.lib libpthread) else() - target_link_libraries(rpcs3 dxgi.lib d2d1.lib dwrite.lib) + target_link_libraries(rpcs3 dxgi.lib d2d1.lib dwrite.lib) endif() - target_link_libraries(rpcs3 avformat.lib avcodec.lib avutil.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS}) + target_link_libraries(rpcs3 avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS}) else() - target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${OPENGL_LIBRARIES}) + target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) if(APPLE) target_link_libraries(rpcs3 hidapi-mac "-framework CoreFoundation" "-framework IOKit") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") @@ -403,46 +400,46 @@ else() if(VULKAN_FOUND) target_link_libraries(rpcs3 ${VULKAN_LIBRARIES}) endif() - target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ZLIB::ZLIB ${ADDITIONAL_LIBS}) - if(USE_SYSTEM_FFMPEG) + target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS}) + if (USE_SYSTEM_FFMPEG) link_libraries(${FFMPEG_LIBRARY_DIR}) - target_link_libraries(rpcs3 libavformat.so libavcodec.so libavutil.so libswscale.so) + target_link_libraries(rpcs3 libavformat.so libavcodec.so libavutil.so libswresample.so libswscale.so) else() - target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswscale.a) + target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a) endif() - if(USE_SYSTEM_LIBPNG) - target_link_libraries(rpcs3 ${PNG_LIBRARIES}) + if (USE_SYSTEM_LIBPNG) + target_link_libraries(rpcs3 ${PNG_LIBRARIES}) else() - target_link_libraries(rpcs3 png16_static) + target_link_libraries(rpcs3 png16_static) endif() endif() # For some reason GCC 7 requires manually linking with -latomic -if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7)) +if (CMAKE_COMPILER_IS_GNUCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7)) target_link_libraries(rpcs3 -latomic) endif() if(LLVM_FOUND) - target_link_libraries(rpcs3 ${LLVM_LIBS}) + target_link_libraries(rpcs3 ${LLVM_LIBS}) endif() target_link_libraries(rpcs3 ${RPCS3_QT_LIBS}) set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h") -if(MSVC) - # Under Windows, some QT DLLs need to be in the same directory of the compiled - # RPCS3 binary, so call the windeployqt tool that will take care of copying - # them from the local QT installation at the end of the build. - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug ${CMAKE_BINARY_DIR}/bin - ) - else() - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations ${CMAKE_BINARY_DIR}/bin - ) - endif() +if (MSVC) + # Under Windows, some QT DLLs need to be in the same directory of the compiled + # RPCS3 binary, so call the windeployqt tool that will take care of copying + # them from the local QT installation at the end of the build. + if (CMAKE_BUILD_TYPE STREQUAL "Debug") + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug ${CMAKE_BINARY_DIR}/bin + ) + else() + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations ${CMAKE_BINARY_DIR}/bin + ) + endif() endif() cotire(rpcs3) 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..be12187392 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] = {}; } 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 ebe9e3d385..48c492cdd8 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 939431dfa5..d9e9f14f01 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -61,7 +61,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 ee2c2d2aff..01286488af 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 60c435f72c..640467d544 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