Merge pull request #10717 from shuffle2/vs17.2.3

msvc: update to vs 17.2.3
This commit is contained in:
Mai M 2022-06-02 20:18:33 -04:00 committed by GitHub
commit 5808a0bc9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View file

@ -39,7 +39,7 @@ Dolphin can only be installed on devices that satisfy the above requirements. At
## Building for Windows ## Building for Windows
Use the solution file `Source/dolphin-emu.sln` to build Dolphin on Windows. Use the solution file `Source/dolphin-emu.sln` to build Dolphin on Windows.
Visual Studio 2022 17.2 or later is a hard requirement. Other compilers might be Visual Studio 2022 17.2.3 or later is a hard requirement. Other compilers might be
able to build Dolphin on Windows but have not been tested and are not able to build Dolphin on Windows but have not been tested and are not
recommended to be used. Git and Windows 11 SDK must be installed when building. recommended to be used. Git and Windows 11 SDK must be installed when building.

View file

@ -8,7 +8,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
add_definitions(-DUNICODE) add_definitions(-DUNICODE)
add_definitions(-D_UNICODE) add_definitions(-D_UNICODE)
add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-DWIN32_LEAN_AND_MEAN)
add_definitions(-D_WIN32_WINNT=0x0602)
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_SECURE_NO_DEPRECATE)

View file

@ -6,15 +6,15 @@
#define STRINGIFY_HELPER(x) #x #define STRINGIFY_HELPER(x) #x
#define STRINGIFY(x) STRINGIFY_HELPER(x) #define STRINGIFY(x) STRINGIFY_HELPER(x)
#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193231328 #if defined _MSC_FULL_VER && _MSC_FULL_VER < 193231329
#pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER)) #pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER))
#error Please update your build environment to the latest Visual Studio 2022! #error Please update your build environment to the latest Visual Studio 2022!
#endif #endif
#include <sdkddkver.h> #include <sdkddkver.h>
#ifndef NTDDI_WIN10_CO #ifndef NTDDI_WIN10_NI
#pragma message("Current WDK_NTDDI_VERSION: " STRINGIFY(WDK_NTDDI_VERSION)) #pragma message("Current WDK_NTDDI_VERSION: " STRINGIFY(WDK_NTDDI_VERSION))
#error Windows 10.0.22000 SDK or later is required #error Windows 10.0.22621 SDK or later is required
#endif #endif
#undef STRINGIFY #undef STRINGIFY