suyu/dynarmic
26
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

xbyak: Correct xbyak include directory

Browse source 
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
This commit is contained in:
Merry 2021-08-07 15:13:38 +01:00
parent 31cefb22a0
commit 07b5734fb0
15 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
externals/CMakeLists.txt vendored
View file

@ -36,7 +36,9 @@ endif()
if (NOT TARGET xbyak) if (NOT TARGET xbyak)
if (ARCHITECTURE STREQUAL "x86" OR ARCHITECTURE STREQUAL "x86_64") if (ARCHITECTURE STREQUAL "x86" OR ARCHITECTURE STREQUAL "x86_64")
add_library(xbyak INTERFACE) 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) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
endif() endif()
endif() endif()

2
src/dynarmic/backend/x64/a32_jitstate.h
View file

@ -7,7 +7,7 @@
#include <array> #include <array>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"

2
src/dynarmic/backend/x64/a64_jitstate.h
View file

@ -7,7 +7,7 @@
#include <array> #include <array>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/nzcv_util.h" #include "dynarmic/backend/x64/nzcv_util.h"
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"

2
src/dynarmic/backend/x64/abi.cpp
View file

@ -8,7 +8,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/block_of_code.h" #include "dynarmic/backend/x64/block_of_code.h"
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"

2
src/dynarmic/backend/x64/block_of_code.cpp
View file

@ -15,7 +15,7 @@
#include <array> #include <array>
#include <cstring> #include <cstring>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/a32_jitstate.h" #include "dynarmic/backend/x64/a32_jitstate.h"
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"

4
src/dynarmic/backend/x64/block_of_code.h
View file

@ -10,8 +10,8 @@
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include <xbyak_util.h> #include <xbyak/xbyak_util.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/callback.h" #include "dynarmic/backend/x64/callback.h"

2
src/dynarmic/backend/x64/callback.h
View file

@ -8,7 +8,7 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"

2
src/dynarmic/backend/x64/constant_pool.h
View file

@ -8,7 +8,7 @@
#include <map> #include <map>
#include <tuple> #include <tuple>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"

2
src/dynarmic/backend/x64/emit_x64.h
View file

@ -13,7 +13,7 @@
#include <tsl/robin_map.h> #include <tsl/robin_map.h>
#include <tsl/robin_set.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/exception_handler.h"
#include "dynarmic/backend/x64/reg_alloc.h" #include "dynarmic/backend/x64/reg_alloc.h"

2
src/dynarmic/backend/x64/hostloc.cpp
View file

@ -5,7 +5,7 @@
#include "dynarmic/backend/x64/hostloc.h" #include "dynarmic/backend/x64/hostloc.h"
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/stack_layout.h" #include "dynarmic/backend/x64/stack_layout.h"

2
src/dynarmic/backend/x64/hostloc.h
View file

@ -4,7 +4,7 @@
*/ */
#pragma once #pragma once
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/common/assert.h" #include "dynarmic/common/assert.h"
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"

2
src/dynarmic/backend/x64/oparg.h
View file

@ -5,7 +5,7 @@
#pragma once #pragma once
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/common/assert.h" #include "dynarmic/common/assert.h"

2
src/dynarmic/backend/x64/reg_alloc.cpp
View file

@ -10,7 +10,7 @@
#include <utility> #include <utility>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/stack_layout.h" #include "dynarmic/backend/x64/stack_layout.h"

2
src/dynarmic/backend/x64/reg_alloc.h
View file

@ -11,7 +11,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/block_of_code.h" #include "dynarmic/backend/x64/block_of_code.h"
#include "dynarmic/backend/x64/hostloc.h" #include "dynarmic/backend/x64/hostloc.h"

2
tests/cpu_info.cpp
View file

@ -7,7 +7,7 @@
#include <utility> #include <utility>
#include <catch.hpp> #include <catch.hpp>
#include <xbyak_util.h> #include <xbyak/xbyak_util.h>
TEST_CASE("Host CPU supports", "[a64]") { TEST_CASE("Host CPU supports", "[a64]") {
Xbyak::util::Cpu cpu_info; Xbyak::util::Cpu cpu_info;