From d2fbc7832080955598c9fb6f083414eca47f0f19 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 9 Jan 2018 21:33:46 +0000 Subject: arm_dynarmic: Implement core --- externals/CMakeLists.txt | 10 +++++++++- externals/dynarmic | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'externals') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index aa01acda8..dcf6c460f 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -10,6 +10,14 @@ target_include_directories(catch-single-include INTERFACE catch/single_include) # Crypto++ add_subdirectory(cryptopp) +# Dynarmic +if (ARCHITECTURE_x86_64) + add_library(xbyak INTERFACE) + set(DYNARMIC_TESTS OFF) + set(DYNARMIC_NO_BUNDLED_FMT ON) + add_subdirectory(dynarmic) +endif() + # libfmt add_subdirectory(fmt) @@ -49,7 +57,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # Xbyak if (ARCHITECTURE_x86_64) # Defined before "dynarmic" above - add_library(xbyak INTERFACE) + # add_library(xbyak INTERFACE) target_include_directories(xbyak INTERFACE ./xbyak/xbyak) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) endif() diff --git a/externals/dynarmic b/externals/dynarmic index 305fba50b..a5caa7cd8 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 305fba50babf736d77b71c5a44dd6b0ccb7f9d10 +Subproject commit a5caa7cd8d5741d34dcf0b3447b5f1c3f7333d56 -- cgit v1.2.3