From 7feb6fda83c22df277e0b7a43b493efea0df447c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 16 May 2023 20:21:36 -0700 Subject: [PATCH 1/4] bump minimum VS version to 17.6 --- Source/PCH/pch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h index 46498e445d7f..484f2d343b9f 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 < 193532215 +#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193632532 #pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER)) #error Please update your build environment to the latest Visual Studio 2022! #endif From 519da43b0a3786fbcfd808c92e97ab87e1710f55 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 16 May 2023 20:23:25 -0700 Subject: [PATCH 2/4] Revert "workaround msvc optimizer bug" This reverts commit 28956cc6c26227636f8ddc8e6db8b5fcddf99e6a. --- Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp index c6c79ccbc8a5..4745d2b9b5cb 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp @@ -1355,9 +1355,7 @@ void ZeldaAudioRenderer::FetchVPB(u16 voice_id, VPB* vpb) void ZeldaAudioRenderer::StoreVPB(u16 voice_id, VPB* vpb) { u16* vpb_words = (u16*)vpb; - // volatile is a workaround for msvc optimizer bug, see - // https://developercommunity.visualstudio.com/t/VS-175-bad-codegen-optimizing-loop-with/10291620 - volatile u16* ram_vpbs = (u16*)HLEMemory_Get_Pointer(m_vpb_base_addr); + u16* ram_vpbs = (u16*)HLEMemory_Get_Pointer(m_vpb_base_addr); size_t vpb_size = (m_flags & TINY_VPB) ? 0x80 : 0xC0; size_t base_idx = voice_id * vpb_size; From ac7003a1ac5a6d0e7dedd7e901fa953074f6a64e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 16 May 2023 20:24:45 -0700 Subject: [PATCH 3/4] Revert "windows: temporarily hardcode VCToolsVersion to 14.34.31931.0" This reverts commit 3961afdbb90fae60ca7cbc14815241c1cb86414e. --- Source/Core/Common/build_info.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/build_info.txt.in b/Source/Core/Common/build_info.txt.in index 413de011c13f..5d658d95e693 100644 --- a/Source/Core/Common/build_info.txt.in +++ b/Source/Core/Common/build_info.txt.in @@ -19,5 +19,5 @@ OSMinimumVersionWin11=10.0.22000.0 // VCToolsVersion=14.33.31629 // We're really looking for "14.32.31332.0" (because that's what will appear in the registry once // installed), NOT the other values! -VCToolsVersion=14.34.31931.0 +VCToolsVersion=${VC_TOOLS_VERSION} VCToolsUpdateURL=https://aka.ms/vs/17/release/vc_redist.x64.exe From 7512964b2b8ab697ae1cb59eb1a3b967f3f21441 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 16 May 2023 20:40:20 -0700 Subject: [PATCH 4/4] update readme --- Readme.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 6eadae6e7b72..197d4040f806 100644 --- a/Readme.md +++ b/Readme.md @@ -39,9 +39,10 @@ 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.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. +Dolphin targets the latest MSVC shipped with Visual Studio or Build Tools. +Other compilers might be able to build Dolphin on Windows but have not been +tested and are not recommended to be used. Git and latest Windows SDK must be +installed when building. Make sure to pull submodules before building: ```sh