ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11830 from shuffle2/vs17.6 

update to VS 17.6
This commit is contained in:
Admiral H. Curtiss 2023-05-23 00:37:01 +02:00 committed by GitHub
parent 8fd61d0b54 7512964b2b
commit 68c3b1fb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Readme.md
View File

@ -39,9 +39,10 @@ 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.3 or later is a hard requirement. Other compilers might be Dolphin targets the latest MSVC shipped with Visual Studio or Build Tools.
able to build Dolphin on Windows but have not been tested and are not Other compilers might be able to build Dolphin on Windows but have not been
recommended to be used. Git and Windows 11 SDK must be installed when building. 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: Make sure to pull submodules before building:
```sh ```sh

2
Source/Core/Common/build_info.txt.in
View File

@ -19,5 +19,5 @@ OSMinimumVersionWin11=10.0.22000.0
// VCToolsVersion=14.33.31629 // VCToolsVersion=14.33.31629
// We're really looking for "14.32.31332.0" (because that's what will appear in the registry once // We're really looking for "14.32.31332.0" (because that's what will appear in the registry once
// installed), NOT the other values! // 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 VCToolsUpdateURL=https://aka.ms/vs/17/release/vc_redist.x64.exe

4
Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
View File

@ -1355,9 +1355,7 @@ void ZeldaAudioRenderer::FetchVPB(u16 voice_id, VPB* vpb)
void ZeldaAudioRenderer::StoreVPB(u16 voice_id, VPB* vpb) void ZeldaAudioRenderer::StoreVPB(u16 voice_id, VPB* vpb)
{ {
u16* vpb_words = (u16*)vpb; u16* vpb_words = (u16*)vpb;
// volatile is a workaround for msvc optimizer bug, see u16* ram_vpbs = (u16*)HLEMemory_Get_Pointer(m_vpb_base_addr);
// 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);
size_t vpb_size = (m_flags & TINY_VPB) ? 0x80 : 0xC0; size_t vpb_size = (m_flags & TINY_VPB) ? 0x80 : 0xC0;
size_t base_idx = voice_id * vpb_size; size_t base_idx = voice_id * vpb_size;

2
Source/PCH/pch.h
View File

@ -6,7 +6,7 @@
#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 < 193532215 #if defined _MSC_FULL_VER && _MSC_FULL_VER < 193632532
#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