From a7ec8c81f45a53caab3fdbfefd20d2353bf95557 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 18 Mar 2026 05:57:36 +0000 Subject: [PATCH] fix std + bigobj --- src/common/cityhash.cpp | 2 +- src/yuzu/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/cityhash.cpp b/src/common/cityhash.cpp index cabf02bb81..030f5981ff 100644 --- a/src/common/cityhash.cpp +++ b/src/common/cityhash.cpp @@ -143,7 +143,7 @@ static std::pair WeakHashLen32WithSeeds(u64 w, u64 x, u64 y, u64 z, u6 a += x; a += y; b += Rotate(a, 44); - return make_pair(a + z, b + c); + return std::make_pair(a + z, b + c); } // Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty. diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 975ab8757b..c91de67b4a 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -457,6 +457,11 @@ if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD)) -Wno-missing-field-initializers) endif() +# Unity builds need big objects for MSVC... +if(MSVC AND ENABLE_UNITY_BUILD) + target_compile_options(yuzu /bigobj) +endif() + # Remember that the linker is incredibly stupid. target_link_libraries(yuzu PRIVATE OpenSSL::SSL OpenSSL::Crypto SDL2::SDL2)