VERY experimental Nintendo Switch 2 emulator
C++
[cmake] Fix building on aarch64-linux (#2591)
Marcin Serwinf088f028f3e0
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 411de4620b..994bc184fa 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -310,6 +310,7 @@ endif()if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))set(HAS_NCE 1)add_compile_definitions(HAS_NCE=1)+ find_package(oaknut 2.0.1)endif()if (YUZU_ROOM)diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 6b64ab7820..11c217fce6 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -1224,7 +1224,7 @@ if (HAS_NCE)arm/nce/patcher.harm/nce/visitor_base.h)- target_link_libraries(core PRIVATE merry::mcl merry::oaknut)+ target_link_libraries(core PRIVATE merry::oaknut)endif()if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)diff --git a/src/core/arm/nce/patcher.h b/src/core/arm/nce/patcher.hindex 7f54608e3f..31b122477f 100644--- a/src/core/arm/nce/patcher.h+++ b/src/core/arm/nce/patcher.h@@ -27,11 +27,11 @@ template <>struct std::hash<PatchCacheKey> {size_t operator()(const PatchCacheKey& key) const {// Simple XOR hash of first few bytes- size_t hash = 0;+ size_t hash_ = 0;for (size_t i = 0; i < key.module_id.size(); ++i) {- hash ^= static_cast<size_t>(key.module_id[i]) << ((i % sizeof(size_t)) * 8);+ hash_ ^= static_cast<size_t>(key.module_id[i]) << ((i % sizeof(size_t)) * 8);}- return hash ^ std::hash<uintptr_t>{}(key.offset);+ return hash_ ^ std::hash<uintptr_t>{}(key.offset);}};