Merge pull request #10717 from shuffle2/vs17.2.3

msvc: update to vs 17.2.3
dolphin-emu · Jun 3, 2022 · 5808a0b · 5808a0b
2 parents 0fc1fb0 + f11b6bb
commit 5808a0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Readme.md b/Readme.md
@@ -39,7 +39,7 @@ Dolphin can only be installed on devices that satisfy the above requirements. At
 ## Building for 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
 recommended to be used. Git and Windows 11 SDK must be installed when building.
 

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -8,7 +8,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_definitions(-DUNICODE)
   add_definitions(-D_UNICODE)
   add_definitions(-DWIN32_LEAN_AND_MEAN)
-  add_definitions(-D_WIN32_WINNT=0x0602)
   add_definitions(-D_SCL_SECURE_NO_WARNINGS)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE)

diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h
@@ -6,15 +6,15 @@
 #define STRINGIFY_HELPER(x) #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))
 #error Please update your build environment to the latest Visual Studio 2022!
 #endif
 
 #include <sdkddkver.h>
-#ifndef NTDDI_WIN10_CO
+#ifndef NTDDI_WIN10_NI
 #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
 
 #undef STRINGIFY