diff options
| author | bunnei <bunneidev@gmail.com> | 2019-05-09 13:18:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-09 13:18:49 -0400 |
| commit | 0e9a17b029d54f7d08a3c50156af96ca048ce367 (patch) | |
| tree | e911c22d31f875bd09ea15905d75780bcfb16e82 | |
| parent | c63e68c48015bf9dff5ef53b0f14d18e7e214107 (diff) | |
| parent | 096444452900e12987f8d8c72961b2a7fb9d98a8 (diff) | |
Merge pull request #2440 from lioncash/dynarmic
externals: Update dynarmic to master
| -rw-r--r-- | externals/CMakeLists.txt | 8 | ||||
| m--------- | externals/dynarmic | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 3f8b6cda8..e6fa11a03 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -7,6 +7,10 @@ include(DownloadExternals) add_library(catch-single-include INTERFACE) target_include_directories(catch-single-include INTERFACE catch/single_include) +# libfmt +add_subdirectory(fmt) +add_library(fmt::fmt ALIAS fmt) + # Dynarmic if (ARCHITECTURE_x86_64) set(DYNARMIC_TESTS OFF) @@ -14,10 +18,6 @@ if (ARCHITECTURE_x86_64) add_subdirectory(dynarmic) endif() -# libfmt -add_subdirectory(fmt) -add_library(fmt::fmt ALIAS fmt) - # getopt if (MSVC) add_subdirectory(getopt) diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 4e6848d1c9e8dadc70595c15b5589f8b14aad47 +Subproject 2683a9a3e316b5c3f387bbe6787732b9ff44b8d |