From 1770503185919d2bfa5940464a7759f2cf837c26 Mon Sep 17 00:00:00 2001
From: Merry <git@mary.rs>
Date: Sun, 15 Aug 2021 16:47:52 +0100
Subject: [PATCH 1/2] xbyak: Update include path

---
 externals/CMakeLists.txt             | 4 +++-
 src/common/x64/xbyak_abi.h           | 2 +-
 src/common/x64/xbyak_util.h          | 2 +-
 src/video_core/macro/macro_jit_x64.h | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 4b8d35548..e5f22889f 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -7,7 +7,9 @@ include(DownloadExternals)
 # xbyak
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     add_library(xbyak INTERFACE)
-    target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak)
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
+    target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
     target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
 endif()
 
diff --git a/src/common/x64/xbyak_abi.h b/src/common/x64/xbyak_abi.h
index c2c9b6134..0ddf9b83e 100644
--- a/src/common/x64/xbyak_abi.h
+++ b/src/common/x64/xbyak_abi.h
@@ -6,7 +6,7 @@
 
 #include <bitset>
 #include <initializer_list>
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 #include "common/assert.h"
 
 namespace Common::X64 {
diff --git a/src/common/x64/xbyak_util.h b/src/common/x64/xbyak_util.h
index df17f8cbe..44d2558f1 100644
--- a/src/common/x64/xbyak_util.h
+++ b/src/common/x64/xbyak_util.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <type_traits>
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 #include "common/x64/xbyak_abi.h"
 
 namespace Common::X64 {
diff --git a/src/video_core/macro/macro_jit_x64.h b/src/video_core/macro/macro_jit_x64.h
index 7f50ac2f8..d03d480b4 100644
--- a/src/video_core/macro/macro_jit_x64.h
+++ b/src/video_core/macro/macro_jit_x64.h
@@ -6,7 +6,7 @@
 
 #include <array>
 #include <bitset>
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/x64/xbyak_abi.h"

From af6290ed1252a75f312fd866f33eaeccfbd5d6d5 Mon Sep 17 00:00:00 2001
From: Merry <git@mary.rs>
Date: Sun, 15 Aug 2021 16:13:28 +0100
Subject: [PATCH 2/2] dynarmic: Update and enable DYNARMIC_IGNORE_ASSERTS

---
 externals/CMakeLists.txt | 1 +
 externals/dynarmic       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index e5f22889f..0c2c059a9 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -21,6 +21,7 @@ target_include_directories(catch-single-include INTERFACE catch/single_include)
 if (ARCHITECTURE_x86_64)
     set(DYNARMIC_TESTS OFF)
     set(DYNARMIC_NO_BUNDLED_FMT ON)
+    set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
     add_subdirectory(dynarmic)
 endif()
 
diff --git a/externals/dynarmic b/externals/dynarmic
index 7946868af..517e35f84 160000
--- a/externals/dynarmic
+++ b/externals/dynarmic
@@ -1 +1 @@
-Subproject commit 7946868af49d403fe54c92d2d60ef986513d1fec
+Subproject commit 517e35f845e010788b6febe42fd6ddb187b8c236