summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
authorGravatar liamwhite2022-12-04 10:44:12 -0500
committerGravatar GitHub2022-12-04 10:44:12 -0500
commit02b10a6e4dca0ed94e20e1b7dcc69a073d1f22a4 (patch)
tree25de4a77ee6f3f29e01470bf885b4fa58deb8323 /externals
parentMerge pull request #9344 from liamwhite/null (diff)
parentexternals: update dynarmic, SDL2 (diff)
downloadyuzu-02b10a6e4dca0ed94e20e1b7dcc69a073d1f22a4.tar.gz
yuzu-02b10a6e4dca0ed94e20e1b7dcc69a073d1f22a4.tar.xz
yuzu-02b10a6e4dca0ed94e20e1b7dcc69a073d1f22a4.zip
Merge pull request #9374 from liamwhite/externals
externals: update dynarmic, SDL2
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()
12 12
13# Dynarmic 13# Dynarmic
14if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) 14if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
15 if (ARCHITECTURE_arm64)
16 set(DYNARMIC_FRONTENDS "A32")
17 endif()
18 set(DYNARMIC_NO_BUNDLED_FMT ON) 15 set(DYNARMIC_NO_BUNDLED_FMT ON)
19 set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE) 16 set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
20 add_subdirectory(dynarmic) 17 add_subdirectory(dynarmic)
@@ -72,6 +69,7 @@ if (YUZU_USE_EXTERNAL_SDL2)
72 endif() 69 endif()
73 70
74 add_subdirectory(SDL EXCLUDE_FROM_ALL) 71 add_subdirectory(SDL EXCLUDE_FROM_ALL)
72 target_link_directories(SDL2-static INTERFACE "${SDL2_BINARY_DIR}")
75endif() 73endif()
76 74
77# ENet 75# 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