octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6877 from MerryMage/dyn-ignore-asserts 

dynarmic: Update and enable DYNARMIC_IGNORE_ASSERTS
This commit is contained in:
bunnei 2021-08-19 15:53:14 -07:00 committed by GitHub
parent 519978ce70 af6290ed12
commit 455e28790a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
externals/CMakeLists.txt vendored
View File

@ -7,7 +7,9 @@ include(DownloadExternals)
# xbyak # xbyak
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) if (ARCHITECTURE_x86 OR 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()
@ -19,6 +21,7 @@ target_include_directories(catch-single-include INTERFACE catch/single_include)
if (ARCHITECTURE_x86_64) if (ARCHITECTURE_x86_64)
set(DYNARMIC_TESTS OFF) set(DYNARMIC_TESTS OFF)
set(DYNARMIC_NO_BUNDLED_FMT ON) set(DYNARMIC_NO_BUNDLED_FMT ON)
set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
add_subdirectory(dynarmic) add_subdirectory(dynarmic)
endif() endif()

2
externals/dynarmic vendored

@ -1 +1 @@
Subproject commit 7946868af49d403fe54c92d2d60ef986513d1fec Subproject commit 517e35f845e010788b6febe42fd6ddb187b8c236

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/macro/macro_jit_x64.h
View File

@ -6,7 +6,7 @@
#include <array> #include <array>
#include <bitset> #include <bitset>
#include <xbyak.h> #include <xbyak/xbyak.h>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/x64/xbyak_abi.h" #include "common/x64/xbyak_abi.h"