diff options
| author | 2024-01-29 22:17:00 +0100 | |
|---|---|---|
| committer | 2024-01-30 02:57:50 +0100 | |
| commit | 73e7a259fde9c121adae915986c5f1f9e6fc5d54 (patch) | |
| tree | d8d7d4532faba411fde01188da85664b75ca8bb1 /externals/CMakeLists.txt | |
| parent | Merge pull request #12846 from german77/mii_const (diff) | |
| download | yuzu-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.txt | 5 |
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 |
| 15 | set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) | 15 | set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) |
| 16 | 16 | ||
| 17 | # xbyak | 17 | # Xbyak (also used by Dynarmic, so needs to be added first) |
| 18 | if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) | 18 | if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) |
| 19 | add_subdirectory(xbyak) | 19 | add_subdirectory(xbyak) |
| 20 | endif() | 20 | endif() |
| 21 | 21 | ||
| 22 | # Dynarmic | 22 | # Oaknut (also used by Dynarmic, so needs to be added first) |
| 23 | if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) | 23 | if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) |
| 24 | add_subdirectory(oaknut) | 24 | add_subdirectory(oaknut) |
| 25 | endif() | 25 | endif() |
| 26 | 26 | ||
| 27 | # Dynarmic | ||
| 27 | if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) | 28 | if ((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) |