summaryrefslogtreecommitdiff
path: root/externals/CMakeLists.txt
diff options
context:
space:
mode:
authorGravatar Alexandre Bouvier2024-01-29 22:17:00 +0100
committerGravatar Alexandre Bouvier2024-01-30 02:57:50 +0100
commit73e7a259fde9c121adae915986c5f1f9e6fc5d54 (patch)
treed8d7d4532faba411fde01188da85664b75ca8bb1 /externals/CMakeLists.txt
parentMerge pull request #12846 from german77/mii_const (diff)
downloadyuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.gz
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.xz
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.zip
cmake: prefer system oaknut library
Diffstat (limited to 'externals/CMakeLists.txt')
-rw-r--r--externals/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
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)