diff options
| author | bunnei <bunneidev@gmail.com> | 2021-08-20 00:53:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 00:53:14 +0200 |
| commit | 455e28790a5e3d620fd45899fd1194a968c8da05 (patch) | |
| tree | 5217bf7a0485f1c07ac0d0fd2843c3a868633ab3 | |
| parent | Merge pull request #6887 from v1993/patch-2 (diff) | |
| parent | dynarmic: Update and enable DYNARMIC_IGNORE_ASSERTS (diff) | |
| download | yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.tar yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.tar.gz yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.tar.bz2 yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.tar.lz yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.tar.xz yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.tar.zst yuzu-455e28790a5e3d620fd45899fd1194a968c8da05.zip | |
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| m--------- | externals/dynarmic | 0 | ||||
| -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 |
5 files changed, 7 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 4b8d35548..0c2c059a9 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() @@ -19,6 +21,7 @@ target_include_directories(catch-single-include INTERFACE catch/single_include) if (ARCHITECTURE_x86_64) set(DYNARMIC_TESTS OFF) set(DYNARMIC_NO_BUNDLED_FMT ON) + set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE) add_subdirectory(dynarmic) endif() diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 7946868af49d403fe54c92d2d60ef986513d1fe +Subproject 517e35f845e010788b6febe42fd6ddb187b8c23 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" |