summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2022-12-03 19:32:24 +0100
committerLiam <byteslice@airmail.cc>2022-12-04 16:12:26 +0100
commit6d2c59737177dba09a0a2a31e96276addf52c172 (patch)
tree9bb6050c056d66f880557e3fd5b3058638afd66d /externals
parentMerge pull request #9300 from ameerj/pch (diff)
downloadyuzu-6d2c59737177dba09a0a2a31e96276addf52c172.tar
yuzu-6d2c59737177dba09a0a2a31e96276addf52c172.tar.gz
yuzu-6d2c59737177dba09a0a2a31e96276addf52c172.tar.bz2
yuzu-6d2c59737177dba09a0a2a31e96276addf52c172.tar.lz
yuzu-6d2c59737177dba09a0a2a31e96276addf52c172.tar.xz
yuzu-6d2c59737177dba09a0a2a31e96276addf52c172.tar.zst
yuzu-6d2c59737177dba09a0a2a31e96276addf52c172.zip
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt4
m---------externals/SDL0
m---------externals/dynarmic0
3 files changed, 1 insertions, 3 deletions
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
-Subproject b424665e0899769b200231ba943353a5fee1b6b
+Subproject f17058b562c8a1090c0c996b42982721ace9090
diff --git a/externals/dynarmic b/externals/dynarmic
-Subproject a5b57bb9cd1500a6e0a3c800b35c1984211dff1
+Subproject a76a2fff534b5584c9921bc5c060e910e95b773