octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
SachinVin 2022-06-12 16:56:05 +05:30
parent 726964ff20
commit 4a590d1fcb
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
externals/CMakeLists.txt vendored
View File

@ -34,7 +34,9 @@ add_subdirectory(cryptopp)
# Xbyak # Xbyak
if (ARCHITECTURE_x86_64) if (ARCHITECTURE_x86_64)
add_library(xbyak INTERFACE) 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) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
endif() endif()

2
src/common/x64/xbyak_abi.h
View File

@ -6,7 +6,7 @@
#include <bitset> #include <bitset>
#include <initializer_list> #include <initializer_list>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "common/assert.h" #include "common/assert.h"
namespace Common::X64 { namespace Common::X64 {

2
src/common/x64/xbyak_util.h
View File

@ -5,7 +5,7 @@
#pragma once #pragma once
#include <type_traits> #include <type_traits>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "common/x64/xbyak_abi.h" #include "common/x64/xbyak_abi.h"
namespace Common::X64 { namespace Common::X64 {

2
src/video_core/shader/shader_jit_x64_compiler.h
View File

@ -11,7 +11,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <nihstro/shader_bytecode.h> #include <nihstro/shader_bytecode.h>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "common/bit_set.h" #include "common/bit_set.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "video_core/shader/shader.h" #include "video_core/shader/shader.h"