summaryrefslogtreecommitdiffstats
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)
# xbyak
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
- add_library(xbyak INTERFACE)
- 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)
+ add_subdirectory(xbyak)
endif()
# Dynarmic
-if (ARCHITECTURE_x86_64)
+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
+ if (ARCHITECTURE_arm64)
+ set(DYNARMIC_FRONTENDS "A32")
+ endif()
set(DYNARMIC_NO_BUNDLED_FMT ON)
set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
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