fix license

[service] unstub process winding
[cmake] Use siritConfig instead of the module (#2593 )
2025-09-27 01:07:49 +02:00 · 2025-09-27 01:07:49 +02:00 · 2025-09-27 01:02:49 +02:00 · 2025-09-27 01:02:34 +02:00 · 2025-09-26 21:46:56 +02:00
6 changed files with 7 additions and 17 deletions
--- 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)
--- a/CMakeModules/Findsirit.cmake
+++ b/CMakeModules/Findsirit.cmake
@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_search_module(sirit QUIET IMPORTED_TARGET sirit)
-find_package_handle_standard_args(sirit
-    REQUIRED_VARS sirit_LINK_LIBRARIES
-    VERSION_VAR sirit_VERSION
-)
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@ -10,7 +10,7 @@
        "repo": "eden-emulator/sirit",
        "sha": "db1f1e8ab5",
        "hash": "73eb3a042848c63a10656545797e85f40d142009dfb7827384548a385e1e28e1ac72f42b25924ce530d58275f8638554281e884d72f9c7aaf4ed08690a414b05",
-        "find_args": "MODULE",
+        "find_args": "CONFIG",
        "options": [
            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
        ]
--- 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)
--- 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);
    }
 };

--- a/src/dynarmic/src/dynarmic/CMakeLists.txt
+++ b/src/dynarmic/src/dynarmic/CMakeLists.txt
@ -374,7 +374,7 @@ endif()

 target_compile_options(dynarmic PRIVATE ${DYNARMIC_CXX_FLAGS})
 target_link_libraries(dynarmic
-    PRIVATE
+    PUBLIC
        fmt::fmt
        merry::mcl
 )
Author	SHA1	Message	Date
unknown	f3836545d9	fix license All checks were successful eden-license / license-header (pull_request) Successful in 24s Details	2025-09-27 01:07:49 +02:00
unknown	106e1a98bd	[service] unstub process winding	2025-09-27 01:07:49 +02:00
Marcin Serwin	4982dcfaa5	[cmake] Use siritConfig instead of the module (#2593 ) Tested together with https://github.com/eden-emulator/sirit/pull/2 Signed-off-by: Marcin Serwin <marcin@serwin.dev> Reviewed-on: #2593 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev> Co-authored-by: Marcin Serwin <marcin@serwin.dev> Co-committed-by: Marcin Serwin <marcin@serwin.dev>	2025-09-27 01:02:49 +02:00
crueter	677148bdca	[cmake] PUBLIC link to mcl for dynarmic (#2595 ) fixes comp error in core/arm Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: #2595	2025-09-27 01:02:34 +02:00
Marcin Serwin	f088f028f3	[cmake] Fix building on aarch64-linux (#2591 ) Reviewed-on: #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>	2025-09-26 21:46:56 +02:00