diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| m--------- | externals/dynarmic | 0 | ||||
| m--------- | externals/oaknut | 0 |
3 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) diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 0df09e2f6b61c2d7ad2f2053d4f020a5c33e037 +Subproject ca0e264f4f962e29baa23a3282ce484625866b9 diff --git a/externals/oaknut b/externals/oaknut -Subproject 918bd94f025d6a2de13978468351598997ae390 +Subproject 9d091109deb445bc6e9289c6195a282b7c993d4 |