summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2019-05-09 13:18:49 -0400
committerGravatar GitHub2019-05-09 13:18:49 -0400
commit0e9a17b029d54f7d08a3c50156af96ca048ce367 (patch)
treee911c22d31f875bd09ea15905d75780bcfb16e82
parentMerge pull request #2451 from lioncash/travis (diff)
parentexternals: Update dynarmic to master (diff)
downloadyuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.gz
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.xz
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.zip
Merge pull request #2440 from lioncash/dynarmic
externals: Update dynarmic to master
-rw-r--r--externals/CMakeLists.txt8
m---------externals/dynarmic0
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)
7add_library(catch-single-include INTERFACE) 7add_library(catch-single-include INTERFACE)
8target_include_directories(catch-single-include INTERFACE catch/single_include) 8target_include_directories(catch-single-include INTERFACE catch/single_include)
9 9
10# libfmt
11add_subdirectory(fmt)
12add_library(fmt::fmt ALIAS fmt)
13
10# Dynarmic 14# Dynarmic
11if (ARCHITECTURE_x86_64) 15if (ARCHITECTURE_x86_64)
12 set(DYNARMIC_TESTS OFF) 16 set(DYNARMIC_TESTS OFF)
@@ -14,10 +18,6 @@ if (ARCHITECTURE_x86_64)
14 add_subdirectory(dynarmic) 18 add_subdirectory(dynarmic)
15endif() 19endif()
16 20
17# libfmt
18add_subdirectory(fmt)
19add_library(fmt::fmt ALIAS fmt)
20
21# getopt 21# getopt
22if (MSVC) 22if (MSVC)
23 add_subdirectory(getopt) 23 add_subdirectory(getopt)
diff --git a/externals/dynarmic b/externals/dynarmic
Subproject 4e6848d1c9e8dadc70595c15b5589f8b14aad47 Subproject 2683a9a3e316b5c3f387bbe6787732b9ff44b8d