The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 11:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9430 from shuffle2/vsupdate

Browse Source 
Bump msvc version check and revert a msvc workaround
This commit is contained in:
LC 2021-01-10 01:46:28 -05:00 committed by GitHub
commit 75e19a0c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h
View File

@ -89,8 +89,7 @@ struct OutputReportLeds
u8 rumble : 1; u8 rumble : 1;
u8 ack : 1; u8 ack : 1;
// This field must be named to work around a msvc bug. u8 : 2;
u8 _padding : 2;
u8 leds : 4; u8 leds : 4;
}; };
static_assert(sizeof(OutputReportLeds) == 1, "Wrong size"); static_assert(sizeof(OutputReportLeds) == 1, "Wrong size");

2
Source/PCH/pch.h
View File

@ -7,7 +7,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 < 192729111 #if defined _MSC_FULL_VER && _MSC_FULL_VER < 192829335
#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 2019! #error Please update your build environment to the latest Visual Studio 2019!
#endif #endif