From a720e8509bfaa075705e7248c39eefbba17df3d9 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 2 Jun 2022 15:52:53 -0700 Subject: [PATCH 1/3] msvc: update min version to VS 17.2.3 --- Readme.md | 2 +- Source/PCH/pch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index d0a4bdc724..9bca20f9d8 100644 --- 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/PCH/pch.h b/Source/PCH/pch.h index 10efeec5e0..e1448056d7 100644 --- a/Source/PCH/pch.h +++ b/Source/PCH/pch.h @@ -6,7 +6,7 @@ #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 From b07d6116d9b7cb5b4da07d6ce904557e620e6ca3 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 2 Jun 2022 15:53:29 -0700 Subject: [PATCH 2/3] update min windows sdk to 10.0.22621 --- Source/PCH/pch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h index e1448056d7..b935c1528b 100644 --- a/Source/PCH/pch.h +++ b/Source/PCH/pch.h @@ -12,9 +12,9 @@ #endif #include -#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 From f11b6bbdda9c8cfe0e227bb91b9d201daead39f3 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 2 Jun 2022 15:56:01 -0700 Subject: [PATCH 3/3] cmake/win: don't set _WIN32_WINNT --- Source/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index c9d2edb516..cca7a20f2a 100644 --- 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)