summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-05-09 19:18:49 +0200
committerGitHub <noreply@github.com>2019-05-09 19:18:49 +0200
commit0e9a17b029d54f7d08a3c50156af96ca048ce367 (patch)
treee911c22d31f875bd09ea15905d75780bcfb16e82
parentMerge pull request #2451 from lioncash/travis (diff)
parentexternals: Update dynarmic to master (diff)
downloadyuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.gz
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.bz2
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.lz
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.xz
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.tar.zst
yuzu-0e9a17b029d54f7d08a3c50156af96ca048ce367.zip
-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)
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