From 1ea1affe0a77775ff6defd3caa09ae34d64fd280 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Thu, 1 Sep 2016 23:00:15 -0400
Subject: [PATCH] dynarmic: Add new submodule.

---
 .gitmodules        | 23 +++++++++++++----------
 CMakeLists.txt     |  3 +++
 externals/dynarmic |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 160000 externals/dynarmic

diff --git a/.gitmodules b/.gitmodules
index 1f0b80768..f498a60de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,18 @@
 [submodule "inih"]
-	path = externals/inih/inih
-	url = https://github.com/svn2github/inih
+    path = externals/inih/inih
+    url = https://github.com/svn2github/inih
 [submodule "boost"]
-	path = externals/boost
-	url = https://github.com/citra-emu/ext-boost.git
+    path = externals/boost
+    url = https://github.com/citra-emu/ext-boost.git
 [submodule "nihstro"]
-	path = externals/nihstro
-	url = https://github.com/neobrain/nihstro.git
+    path = externals/nihstro
+    url = https://github.com/neobrain/nihstro.git
 [submodule "soundtouch"]
-	path = externals/soundtouch
-	url = https://github.com/citra-emu/ext-soundtouch.git
+    path = externals/soundtouch
+    url = https://github.com/citra-emu/ext-soundtouch.git
 [submodule "catch"]
-	path = externals/catch
-	url = https://github.com/philsquared/Catch.git
+    path = externals/catch
+    url = https://github.com/philsquared/Catch.git
+[submodule "dynarmic"]
+    path = externals/dynarmic
+    url = https://github.com/MerryMage/dynarmic.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3932fd569..c7a24f04f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,9 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
 include_directories(${INI_PREFIX})
 add_subdirectory(${INI_PREFIX})
 
+option(DYNARMIC_TESTS OFF)
+add_subdirectory(externals/dynarmic)
+
 add_subdirectory(externals/glad)
 include_directories(externals/microprofile)
 include_directories(externals/nihstro/include)
diff --git a/externals/dynarmic b/externals/dynarmic
new file mode 160000
index 000000000..943487ece
--- /dev/null
+++ b/externals/dynarmic
@@ -0,0 +1 @@
+Subproject commit 943487eceed82fbae016c333dc9fe33981e69aa8