summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMerry <git@mary.rs>2021-08-15 17:47:52 +0200
committermerry <MerryMage@users.noreply.github.com>2021-08-15 20:26:38 +0200
commit1770503185919d2bfa5940464a7759f2cf837c26 (patch)
tree6d9a866568fe42d7aca451f0e0e23e87adbe3844
parentMerge pull request #6861 from yzct12345/const-mempy-is-all-the-speed (diff)
downloadyuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar
yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.gz
yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.bz2
yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.lz
yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.xz
yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.zst
yuzu-1770503185919d2bfa5940464a7759f2cf837c26.zip
-rw-r--r--externals/CMakeLists.txt4
-rw-r--r--src/common/x64/xbyak_abi.h2
-rw-r--r--src/common/x64/xbyak_util.h2
-rw-r--r--src/video_core/macro/macro_jit_x64.h2
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"