From 4e884588142fa7f2c98eb6a3bd1984d696273f2e Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sat, 27 May 2017 14:23:55 -0700
Subject: [PATCH 1/2] Update dynarmic

Updated to incorporate fix from MerryMage/dynarmic#106 which is required
for using fmt in Citra.
---
 externals/dynarmic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/dynarmic b/externals/dynarmic
index 358cf7c32..7707ff13e 160000
--- a/externals/dynarmic
+++ b/externals/dynarmic
@@ -1 +1 @@
-Subproject commit 358cf7c32205a5114964865c86a8455daf810732
+Subproject commit 7707ff13e981b0aecf87f3156ee0b641469f7bb3

From a06220682cd4fb56f4db1eec7cdf647d3e21d88a Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sat, 27 May 2017 14:22:35 -0700
Subject: [PATCH 2/2] Add the fmt string formatting library

More info at http://fmtlib.net/

This commit was based on @jroweboy's work on his spdlog branch, but with
modifications.
---
 .gitmodules              | 3 +++
 CMakeLists.txt           | 1 +
 externals/CMakeLists.txt | 1 +
 externals/fmt            | 1 +
 4 files changed, 6 insertions(+)
 create mode 160000 externals/fmt

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
index 000000000..ac5484c4e
--- /dev/null
+++ b/externals/fmt
@@ -0,0 +1 @@
+Subproject commit ac5484c4e7365b59d8c7e14db6778de26635e428