summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorAlexandre Bouvier <contact@amb.tf>2024-01-29 22:17:00 +0100
committerAlexandre Bouvier <contact@amb.tf>2024-01-30 02:57:50 +0100
commit73e7a259fde9c121adae915986c5f1f9e6fc5d54 (patch)
treed8d7d4532faba411fde01188da85664b75ca8bb1 /externals
parentMerge pull request #12846 from german77/mii_const (diff)
downloadyuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.gz
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.bz2
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.lz
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.xz
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.tar.zst
yuzu-73e7a259fde9c121adae915986c5f1f9e6fc5d54.zip
Diffstat (limited to 'externals')
-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)
# Skip install rules for all externals
set_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()
+# Dynarmic
if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)
set(DYNARMIC_IGNORE_ASSERTS ON)
add_subdirectory(dynarmic)