From cc37fb13580cce2381d2cdbc4f5d3e68a775808f Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Tue, 29 Dec 2015 15:19:08 -0800
Subject: [PATCH] Updating to the latest capstone. Fixes #440.

---
 src/xenia/cpu/backend/x64/x64_assembler.cc | 4 ++--
 src/xenia/debug/debugger.cc                | 4 ++--
 src/xenia/debug/ui/debug_window.cc         | 4 ++--
 third_party/capstone                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/xenia/cpu/backend/x64/x64_assembler.cc b/src/xenia/cpu/backend/x64/x64_assembler.cc
index 122a374d6..2b1cd7bfe 100644
--- a/src/xenia/cpu/backend/x64/x64_assembler.cc
+++ b/src/xenia/cpu/backend/x64/x64_assembler.cc
@@ -11,8 +11,8 @@
 
 #include <climits>
 
-#include "third_party/capstone/include/capstone/capstone.h"
-#include "third_party/capstone/include/capstone/x86.h"
+#include "third_party/capstone/include/capstone.h"
+#include "third_party/capstone/include/x86.h"
 #include "xenia/base/profiling.h"
 #include "xenia/base/reset_scope.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
diff --git a/src/xenia/debug/debugger.cc b/src/xenia/debug/debugger.cc
index 5e1252d2a..80e18d00b 100644
--- a/src/xenia/debug/debugger.cc
+++ b/src/xenia/debug/debugger.cc
@@ -14,8 +14,8 @@
 #include <algorithm>
 #include <utility>
 
-#include "third_party/capstone/include/capstone/capstone.h"
-#include "third_party/capstone/include/capstone/x86.h"
+#include "third_party/capstone/include/capstone.h"
+#include "third_party/capstone/include/x86.h"
 #include "xenia/base/debugging.h"
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"
diff --git a/src/xenia/debug/ui/debug_window.cc b/src/xenia/debug/ui/debug_window.cc
index 3eb971afe..31399d8e3 100644
--- a/src/xenia/debug/ui/debug_window.cc
+++ b/src/xenia/debug/ui/debug_window.cc
@@ -15,8 +15,8 @@
 #include <cinttypes>
 #include <utility>
 
-#include "third_party/capstone/include/capstone/capstone.h"
-#include "third_party/capstone/include/capstone/x86.h"
+#include "third_party/capstone/include/capstone.h"
+#include "third_party/capstone/include/x86.h"
 #include "third_party/imgui/imgui.h"
 #include "third_party/imgui/imgui_internal.h"
 #include "xenia/base/clock.h"
diff --git a/third_party/capstone b/third_party/capstone
index a0fe33916..121057635 160000
--- a/third_party/capstone
+++ b/third_party/capstone
@@ -1 +1 @@
-Subproject commit a0fe339167141ddb72e22486cd93fb5a1546de59
+Subproject commit 121057635173f4da4ce26dd676c7470aef7bddce