From 6d2c59737177dba09a0a2a31e96276addf52c172 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 3 Dec 2022 13:32:24 -0500 Subject: externals: update dynarmic, SDL2 --- externals/CMakeLists.txt | 4 +--- externals/SDL | 2 +- externals/dynarmic | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'externals') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 25ef0c058..db41a6635 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -12,9 +12,6 @@ endif() # Dynarmic 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) @@ -72,6 +69,7 @@ if (YUZU_USE_EXTERNAL_SDL2) endif() add_subdirectory(SDL EXCLUDE_FROM_ALL) + target_link_directories(SDL2-static INTERFACE "${SDL2_BINARY_DIR}") endif() # ENet diff --git a/externals/SDL b/externals/SDL index b424665e0..f17058b56 160000 --- a/externals/SDL +++ b/externals/SDL @@ -1 +1 @@ -Subproject commit b424665e0899769b200231ba943353a5fee1b6b6 +Subproject commit f17058b562c8a1090c0c996b42982721ace90903 diff --git a/externals/dynarmic b/externals/dynarmic index a5b57bb9c..a76a2fff5 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit a5b57bb9cd1500a6e0a3c800b35c1984211dff1d +Subproject commit a76a2fff534b5584c9921bc5c060e910e95b7738 -- cgit v1.2.3