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 #8898 from JosJuice/windows-cmake-new-lambda-processor 

Replace Windows CMake lambda constexpr capture workaround
This commit is contained in:
Tilka 2020-06-25 15:19:09 +01:00 committed by GitHub
parent 502ab789d9 c9edfa0eaa
commit 4eb4b1d2b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -241,6 +241,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
add_compile_options(/Zc:throwingNew) add_compile_options(/Zc:throwingNew)
# Enforce strict volatile semantics as per ISO C++ # Enforce strict volatile semantics as per ISO C++
add_compile_options(/volatile:iso) add_compile_options(/volatile:iso)
# Fix non-conformant lambda behavior (constexpr variables shouldn't need capturing)
add_compile_options(/experimental:newLambdaProcessor)
string(APPEND CMAKE_EXE_LINKER_FLAGS " /NXCOMPAT") string(APPEND CMAKE_EXE_LINKER_FLAGS " /NXCOMPAT")
else() else()

6
Source/Core/DolphinQt/Config/VerifyWidget.cpp
View File

@ -139,9 +139,9 @@ void VerifyWidget::Verify()
progress.GetRaw()->setMinimumDuration(500); progress.GetRaw()->setMinimumDuration(500);
progress.GetRaw()->setWindowModality(Qt::WindowModal); progress.GetRaw()->setWindowModality(Qt::WindowModal);
auto future = std::async( auto future =
std::launch::async, std::async(std::launch::async,
[&verifier, &progress, DIVISOR]() -> std::optional<DiscIO::VolumeVerifier::Result> { [&verifier, &progress]() -> std::optional<DiscIO::VolumeVerifier::Result> {
progress.SetValue(0); progress.SetValue(0);
verifier.Start(); verifier.Start();
while (verifier.GetBytesProcessed() != verifier.GetTotalBytes()) while (verifier.GetBytesProcessed() != verifier.GetTotalBytes())

2
Source/Core/VideoCommon/CommandProcessor.cpp
View File

@ -196,7 +196,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
} }
mmio->Register(base | FIFO_BP_LO, MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPBreakpoint)), mmio->Register(base | FIFO_BP_LO, MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPBreakpoint)),
MMIO::ComplexWrite<u16>([WMASK_LO_ALIGN_32BIT](u32, u16 val) { MMIO::ComplexWrite<u16>([](u32, u16 val) {
WriteLow(fifo.CPBreakpoint, val & WMASK_LO_ALIGN_32BIT); WriteLow(fifo.CPBreakpoint, val & WMASK_LO_ALIGN_32BIT);
})); }));
mmio->Register(base | FIFO_BP_HI, mmio->Register(base | FIFO_BP_HI,