From 4a590d1fcb6d58f9436ca53807eab46d6c230490 Mon Sep 17 00:00:00 2001
From: SachinVin <sachinvinayak2000@gmail.com>
Date: Sun, 12 Jun 2022 16:56:05 +0530
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
Co-authored-by: merry <git@mary.rs>
---
 externals/CMakeLists.txt                        | 4 +++-
 src/common/x64/xbyak_abi.h                      | 2 +-
 src/common/x64/xbyak_util.h                     | 2 +-
 src/video_core/shader/shader_jit_x64_compiler.h | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index e4b53f706e..96b473773f 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -34,7 +34,9 @@ add_subdirectory(cryptopp)
 # Xbyak
 if (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 235952a1e6..2326c87c06 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 5cc8a8c76a..461ca0516d 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/shader/shader_jit_x64_compiler.h b/src/video_core/shader/shader_jit_x64_compiler.h
index 573bdf8d38..b6e62f01e5 100644
--- a/src/video_core/shader/shader_jit_x64_compiler.h
+++ b/src/video_core/shader/shader_jit_x64_compiler.h
@@ -11,7 +11,7 @@
 #include <utility>
 #include <vector>
 #include <nihstro/shader_bytecode.h>
-#include <xbyak.h>
+#include <xbyak/xbyak.h>
 #include "common/bit_set.h"
 #include "common/common_types.h"
 #include "video_core/shader/shader.h"