eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] Fix building on aarch64-linux #2591

Merged
crueter merged 3 commits from marcin-serwin/eden:push-kkpwkkxqsysr into master 2025-09-26 21:46:57 +02:00
Conversation 4 Commits 3 Files changed 3 +5 -4
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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)

2
src/core/CMakeLists.txt
View file

@ -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)

6
src/core/arm/nce/patcher.h
View file

@ -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);
}
};