diff --git a/CMakeLists.txt b/CMakeLists.txt index 994bc184fa..411de4620b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,7 +310,6 @@ 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.txt index 11c217fce6..6b64ab7820 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1224,7 +1224,7 @@ if (HAS_NCE) arm/nce/patcher.h arm/nce/visitor_base.h ) - target_link_libraries(core PRIVATE merry::oaknut) + target_link_libraries(core PRIVATE merry::mcl 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.h index 31b122477f..7f54608e3f 100644 --- a/src/core/arm/nce/patcher.h +++ b/src/core/arm/nce/patcher.h @@ -27,11 +27,11 @@ template <> struct std::hash { 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(key.module_id[i]) << ((i % sizeof(size_t)) * 8); + hash ^= static_cast(key.module_id[i]) << ((i % sizeof(size_t)) * 8); } - return hash_ ^ std::hash{}(key.offset); + return hash ^ std::hash{}(key.offset); } };