diff options
| author | bunnei <bunneidev@gmail.com> | 2021-08-19 15:53:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 15:53:14 -0700 |
| commit | 455e28790a5e3d620fd45899fd1194a968c8da05 (patch) | |
| tree | 5217bf7a0485f1c07ac0d0fd2843c3a868633ab3 /externals | |
| parent | 519978ce704606a6e56954f8eee90fdf88824185 (diff) | |
| parent | af6290ed1252a75f312fd866f33eaeccfbd5d6d5 (diff) | |
Merge pull request #6877 from MerryMage/dyn-ignore-asserts
dynarmic: Update and enable DYNARMIC_IGNORE_ASSERTS
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| m--------- | externals/dynarmic | 0 |
2 files changed, 4 insertions, 1 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 |