From 07b5734fb019a219d0c42e5f208417ee625f7ab6 Mon Sep 17 00:00:00 2001
From: Merry <git@mary.rs>
Date: Sat, 7 Aug 2021 15:13:38 +0100
Subject: [PATCH] xbyak: Correct xbyak include directory

xbyak is intended to be installed in /usr/local/include/xbyak.
Since we desire not to install xbyak before using it, we copy the headers
to the appropriate directory structure and use that instead
---
 externals/CMakeLists.txt                   | 4 +++-
 src/dynarmic/backend/x64/a32_jitstate.h    | 2 +-
 src/dynarmic/backend/x64/a64_jitstate.h    | 2 +-
 src/dynarmic/backend/x64/abi.cpp           | 2 +-
 src/dynarmic/backend/x64/block_of_code.cpp | 2 +-
 src/dynarmic/backend/x64/block_of_code.h   | 4 ++--
 src/dynarmic/backend/x64/callback.h        | 2 +-
 src/dynarmic/backend/x64/constant_pool.h   | 2 +-
 src/dynarmic/backend/x64/emit_x64.h        | 2 +-
 src/dynarmic/backend/x64/hostloc.cpp       | 2 +-
 src/dynarmic/backend/x64/hostloc.h         | 2 +-
 src/dynarmic/backend/x64/oparg.h           | 2 +-
 src/dynarmic/backend/x64/reg_alloc.cpp     | 2 +-
 src/dynarmic/backend/x64/reg_alloc.h       | 2 +-
 tests/cpu_info.cpp                         | 2 +-
 15 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d1e17a62..6a869b17 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -36,7 +36,9 @@ endif()
 if (NOT TARGET xbyak)
     if (ARCHITECTURE STREQUAL "x86" OR ARCHITECTURE STREQUAL "x86_64")
         add_library(xbyak INTERFACE)
-        target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/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()
 endif()
diff --git a/src/dynarmic/backend/x64/a32_jitstate.h b/src/dynarmic/backend/x64/a32_jitstate.h
index 68e37c6c..0990d48d 100644
--- a/src/dynarmic/backend/x64/a32_jitstate.h
+++ b/src/dynarmic/backend/x64/a32_jitstate.h
@@ -7,7 +7,7 @@
 
 #include <array>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/common/common_types.h"
 
diff --git a/src/dynarmic/backend/x64/a64_jitstate.h b/src/dynarmic/backend/x64/a64_jitstate.h
index 40cd9cc5..5a4cf16c 100644
--- a/src/dynarmic/backend/x64/a64_jitstate.h
+++ b/src/dynarmic/backend/x64/a64_jitstate.h
@@ -7,7 +7,7 @@
 
 #include <array>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/backend/x64/nzcv_util.h"
 #include "dynarmic/common/common_types.h"
diff --git a/src/dynarmic/backend/x64/abi.cpp b/src/dynarmic/backend/x64/abi.cpp
index b1c16a2d..8535d764 100644
--- a/src/dynarmic/backend/x64/abi.cpp
+++ b/src/dynarmic/backend/x64/abi.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/common/common_types.h"
diff --git a/src/dynarmic/backend/x64/block_of_code.cpp b/src/dynarmic/backend/x64/block_of_code.cpp
index 689d2136..3120cf47 100644
--- a/src/dynarmic/backend/x64/block_of_code.cpp
+++ b/src/dynarmic/backend/x64/block_of_code.cpp
@@ -15,7 +15,7 @@
 #include <array>
 #include <cstring>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/backend/x64/a32_jitstate.h"
 #include "dynarmic/backend/x64/abi.h"
diff --git a/src/dynarmic/backend/x64/block_of_code.h b/src/dynarmic/backend/x64/block_of_code.h
index b56ba9d3..97b8930a 100644
--- a/src/dynarmic/backend/x64/block_of_code.h
+++ b/src/dynarmic/backend/x64/block_of_code.h
@@ -10,8 +10,8 @@
 #include <memory>
 #include <type_traits>
 
-#include <xbyak.h>
-#include <xbyak_util.h>
+#include <xbyak/xbyak.h>
+#include <xbyak/xbyak_util.h>
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/callback.h"
diff --git a/src/dynarmic/backend/x64/callback.h b/src/dynarmic/backend/x64/callback.h
index 24405406..ea7aadc0 100644
--- a/src/dynarmic/backend/x64/callback.h
+++ b/src/dynarmic/backend/x64/callback.h
@@ -8,7 +8,7 @@
 #include <functional>
 #include <vector>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/common/common_types.h"
 
diff --git a/src/dynarmic/backend/x64/constant_pool.h b/src/dynarmic/backend/x64/constant_pool.h
index 792918bd..16cdb236 100644
--- a/src/dynarmic/backend/x64/constant_pool.h
+++ b/src/dynarmic/backend/x64/constant_pool.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <tuple>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/common/common_types.h"
 
diff --git a/src/dynarmic/backend/x64/emit_x64.h b/src/dynarmic/backend/x64/emit_x64.h
index aea7b5cf..494caada 100644
--- a/src/dynarmic/backend/x64/emit_x64.h
+++ b/src/dynarmic/backend/x64/emit_x64.h
@@ -13,7 +13,7 @@
 
 #include <tsl/robin_map.h>
 #include <tsl/robin_set.h>
-#include <xbyak_util.h>
+#include <xbyak/xbyak_util.h>
 
 #include "dynarmic/backend/x64/exception_handler.h"
 #include "dynarmic/backend/x64/reg_alloc.h"
diff --git a/src/dynarmic/backend/x64/hostloc.cpp b/src/dynarmic/backend/x64/hostloc.cpp
index 53b7a83b..b5e2a5f1 100644
--- a/src/dynarmic/backend/x64/hostloc.cpp
+++ b/src/dynarmic/backend/x64/hostloc.cpp
@@ -5,7 +5,7 @@
 
 #include "dynarmic/backend/x64/hostloc.h"
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/stack_layout.h"
diff --git a/src/dynarmic/backend/x64/hostloc.h b/src/dynarmic/backend/x64/hostloc.h
index ee704bbb..b6be1146 100644
--- a/src/dynarmic/backend/x64/hostloc.h
+++ b/src/dynarmic/backend/x64/hostloc.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/common_types.h"
diff --git a/src/dynarmic/backend/x64/oparg.h b/src/dynarmic/backend/x64/oparg.h
index 5a598e54..d35297b9 100644
--- a/src/dynarmic/backend/x64/oparg.h
+++ b/src/dynarmic/backend/x64/oparg.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/common/assert.h"
 
diff --git a/src/dynarmic/backend/x64/reg_alloc.cpp b/src/dynarmic/backend/x64/reg_alloc.cpp
index e418dc6f..9eef8143 100644
--- a/src/dynarmic/backend/x64/reg_alloc.cpp
+++ b/src/dynarmic/backend/x64/reg_alloc.cpp
@@ -10,7 +10,7 @@
 #include <utility>
 
 #include <fmt/ostream.h>
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/stack_layout.h"
diff --git a/src/dynarmic/backend/x64/reg_alloc.h b/src/dynarmic/backend/x64/reg_alloc.h
index 3878b59e..58bfe87f 100644
--- a/src/dynarmic/backend/x64/reg_alloc.h
+++ b/src/dynarmic/backend/x64/reg_alloc.h
@@ -11,7 +11,7 @@
 #include <utility>
 #include <vector>
 
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 
 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/hostloc.h"
diff --git a/tests/cpu_info.cpp b/tests/cpu_info.cpp
index a3cfe902..914c9dd1 100644
--- a/tests/cpu_info.cpp
+++ b/tests/cpu_info.cpp
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include <catch.hpp>
-#include <xbyak_util.h>
+#include <xbyak/xbyak_util.h>
 
 TEST_CASE("Host CPU supports", "[a64]") {
     Xbyak::util::Cpu cpu_info;