summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt11
m---------externals/dynarmic0
m---------externals/xbyak0
3 files changed, 5 insertions, 6 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index e80fd124e..7f0a6d069 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -7,15 +7,14 @@ include(DownloadExternals)
7 7
8# xbyak 8# xbyak
9if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) 9if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
10 add_library(xbyak INTERFACE) 10 add_subdirectory(xbyak)
11 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
12 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
13 target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
14 target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
15endif() 11endif()
16 12
17# Dynarmic 13# Dynarmic
18if (ARCHITECTURE_x86_64) 14if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
15 if (ARCHITECTURE_arm64)
16 set(DYNARMIC_FRONTENDS "A32")
17 endif()
19 set(DYNARMIC_NO_BUNDLED_FMT ON) 18 set(DYNARMIC_NO_BUNDLED_FMT ON)
20 set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE) 19 set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
21 add_subdirectory(dynarmic) 20 add_subdirectory(dynarmic)
diff --git a/externals/dynarmic b/externals/dynarmic
Subproject 2d4602a6516c67d547000d4c80bcc5f74976abd Subproject 424fdb5c5026ec5bdd7553271190397f63fb503
diff --git a/externals/xbyak b/externals/xbyak
Subproject c306b8e5786eeeb87b8925a8af5c3bf057ff5a9 Subproject 348e3e548ebac06d243e5881caec8440e249f65