diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-09 22:33:46 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-12 23:48:29 +0100 |
| commit | d2fbc7832080955598c9fb6f083414eca47f0f19 (patch) | |
| tree | 4f4b63aa2d37b86c39fdd17b12731bceda8bc90c /externals | |
| parent | core: Include <algorithm> where used. (diff) | |
| download | yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.gz yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.bz2 yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.lz yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.xz yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.zst yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.zip | |
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 10 | ||||
| m--------- | externals/dynarmic | 0 |
2 files changed, 9 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index aa01acda8..dcf6c460f 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -10,6 +10,14 @@ target_include_directories(catch-single-include INTERFACE catch/single_include) # Crypto++ add_subdirectory(cryptopp) +# Dynarmic +if (ARCHITECTURE_x86_64) + add_library(xbyak INTERFACE) + set(DYNARMIC_TESTS OFF) + set(DYNARMIC_NO_BUNDLED_FMT ON) + add_subdirectory(dynarmic) +endif() + # libfmt add_subdirectory(fmt) @@ -49,7 +57,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # Xbyak if (ARCHITECTURE_x86_64) # Defined before "dynarmic" above - add_library(xbyak INTERFACE) + # add_library(xbyak INTERFACE) target_include_directories(xbyak INTERFACE ./xbyak/xbyak) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) endif() diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 305fba50babf736d77b71c5a44dd6b0ccb7f9d1 +Subproject a5caa7cd8d5741d34dcf0b3447b5f1c3f7333d5 |