summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt4
-rw-r--r--externals/CMakeLists.txt5
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb26fbfd8..f4b64544f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,6 +322,10 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
322 find_package(xbyak 6 CONFIG) 322 find_package(xbyak 6 CONFIG)
323endif() 323endif()
324 324
325if (ARCHITECTURE_arm64)
326 find_package(oaknut 2.0.1 CONFIG)
327endif()
328
325if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) 329if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
326 find_package(dynarmic 6.4.0 CONFIG) 330 find_package(dynarmic 6.4.0 CONFIG)
327endif() 331endif()
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 42355716c..d49a2e43e 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -14,16 +14,17 @@ set(BUILD_SHARED_LIBS OFF)
14# Skip install rules for all externals 14# Skip install rules for all externals
15set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) 15set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
16 16
17# xbyak 17# Xbyak (also used by Dynarmic, so needs to be added first)
18if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) 18if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)
19 add_subdirectory(xbyak) 19 add_subdirectory(xbyak)
20endif() 20endif()
21 21
22# Dynarmic 22# Oaknut (also used by Dynarmic, so needs to be added first)
23if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) 23if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut)
24 add_subdirectory(oaknut) 24 add_subdirectory(oaknut)
25endif() 25endif()
26 26
27# Dynarmic
27if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) 28if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)
28 set(DYNARMIC_IGNORE_ASSERTS ON) 29 set(DYNARMIC_IGNORE_ASSERTS ON)
29 add_subdirectory(dynarmic) 30 add_subdirectory(dynarmic)