summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-27 23:22:35 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-27 23:26:02 +0200
commita06220682cd4fb56f4db1eec7cdf647d3e21d88a (patch)
tree4727b5fcbb7e68a95e99f664a350e27785d46905
parentUpdate dynarmic (diff)
downloadyuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar
yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.gz
yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.bz2
yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.lz
yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.xz
yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.zst
yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.zip
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt1
-rw-r--r--externals/CMakeLists.txt1
m---------externals/fmt0
4 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index f98725622..36caa59f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
[submodule "cryptopp"]
path = externals/cryptopp/cryptopp
url = https://github.com/weidai11/cryptopp.git
+[submodule "fmt"]
+ path = externals/fmt
+ url = https://github.com/fmtlib/fmt.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 306959e24..121b0f2f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,6 +258,7 @@ add_subdirectory(${INI_PREFIX})
add_subdirectory(externals)
option(DYNARMIC_TESTS OFF)
+set(DYNARMIC_NO_BUNDLED_FMT ON)
add_subdirectory(externals/dynarmic)
add_subdirectory(externals/glad)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 309e98464..57fc5d566 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -9,3 +9,4 @@ endif()
add_subdirectory(cryptopp)
+add_subdirectory(fmt)
diff --git a/externals/fmt b/externals/fmt
new file mode 160000
+Subproject ac5484c4e7365b59d8c7e14db6778de26635e42