aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorMarcin Serwin <marcin@serwin.dev>2025-09-26 21:46:56 +0200
committercrueter <crueter@eden-emu.dev>2025-09-26 21:46:56 +0200
commitf088f028f3e018a10552fbe67376d93030ebc3ec (patch)
treefa63c6e1cc37bd2419212c6d3d598a150961bbde /src/core
parent19eb8272b1d818547538e6c9fb63724a8f7bb961 (diff)
[cmake] Fix building on aarch64-linux (#2591)
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2591 Reviewed-by: Lizzie <lizzie@eden-emu.dev> Reviewed-by: crueter <crueter@eden-emu.dev> Co-authored-by: Marcin Serwin <marcin@serwin.dev> Co-committed-by: Marcin Serwin <marcin@serwin.dev>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/arm/nce/patcher.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6b64ab7820..11c217fce6 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::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.h
index 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);
}
};