VERY experimental Nintendo Switch 2 emulator
C++
cmake: prefer system oaknut library
Alexandre Bouviercb943b0fa57b
diff --git a/CMakeLists.txt b/CMakeLists.txtindex eb26fbfd8d..f4b64544f0 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -322,6 +322,10 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)find_package(xbyak 6 CONFIG)endif()+if (ARCHITECTURE_arm64)+ find_package(oaknut 2.0.1 CONFIG)+endif()+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)find_package(dynarmic 6.4.0 CONFIG)endif()diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 42355716cd..d49a2e43e9 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -14,16 +14,17 @@ set(BUILD_SHARED_LIBS OFF)# Skip install rules for all externalsset_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)-# xbyak+# Xbyak (also used by Dynarmic, so needs to be added first)if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)add_subdirectory(xbyak)endif()-# Dynarmic+# Oaknut (also used by Dynarmic, so needs to be added first)if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut)add_subdirectory(oaknut)endif()+# Dynarmicif ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)set(DYNARMIC_IGNORE_ASSERTS ON)add_subdirectory(dynarmic)