Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to VS 17.6 #11830

Merged
merged 4 commits into from
May 22, 2023
Merged

update to VS 17.6 #11830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7feb6fd
bump minimum VS version to 17.6
shuffle2 May 17, 2023
519da43
Revert "workaround msvc optimizer bug"
shuffle2 May 17, 2023
ac7003a
Revert "windows: temporarily hardcode VCToolsVersion to 14.34.31931.0"
shuffle2 May 17, 2023
7512964
update readme
shuffle2 May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/build_info.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Source/PCH/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down