diff options
| author | 2021-08-15 16:47:52 +0100 | |
|---|---|---|
| committer | 2021-08-15 19:26:38 +0100 | |
| commit | 1770503185919d2bfa5940464a7759f2cf837c26 (patch) | |
| tree | 6d9a866568fe42d7aca451f0e0e23e87adbe3844 | |
| parent | Merge pull request #6861 from yzct12345/const-mempy-is-all-the-speed (diff) | |
| download | yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.gz yuzu-1770503185919d2bfa5940464a7759f2cf837c26.tar.xz yuzu-1770503185919d2bfa5940464a7759f2cf837c26.zip | |
xbyak: Update include path
Diffstat (limited to '')
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/common/x64/xbyak_abi.h | 2 | ||||
| -rw-r--r-- | src/common/x64/xbyak_util.h | 2 | ||||
| -rw-r--r-- | 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) | |||
| 7 | # xbyak | 7 | # xbyak |
| 8 | if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) | 8 | if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) |
| 9 | add_library(xbyak INTERFACE) | 9 | add_library(xbyak INTERFACE) |
| 10 | target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak) | 10 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) |
| 11 | file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) | ||
| 12 | target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) | ||
| 11 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) | 13 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) |
| 12 | endif() | 14 | endif() |
| 13 | 15 | ||
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 @@ | |||
| 6 | 6 | ||
| 7 | #include <bitset> | 7 | #include <bitset> |
| 8 | #include <initializer_list> | 8 | #include <initializer_list> |
| 9 | #include <xbyak.h> | 9 | #include <xbyak/xbyak.h> |
| 10 | #include "common/assert.h" | 10 | #include "common/assert.h" |
| 11 | 11 | ||
| 12 | namespace Common::X64 { | 12 | 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 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <type_traits> | 7 | #include <type_traits> |
| 8 | #include <xbyak.h> | 8 | #include <xbyak/xbyak.h> |
| 9 | #include "common/x64/xbyak_abi.h" | 9 | #include "common/x64/xbyak_abi.h" |
| 10 | 10 | ||
| 11 | namespace Common::X64 { | 11 | 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 @@ | |||
| 6 | 6 | ||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include <bitset> | 8 | #include <bitset> |
| 9 | #include <xbyak.h> | 9 | #include <xbyak/xbyak.h> |
| 10 | #include "common/bit_field.h" | 10 | #include "common/bit_field.h" |
| 11 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 12 | #include "common/x64/xbyak_abi.h" | 12 | #include "common/x64/xbyak_abi.h" |