summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--externals/CMakeLists.txt6
m---------externals/nx_tzdb/tzdb_to_nx0
m---------externals/oaknut0
3 files changed, 5 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 40ec20f3d..04007a538 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -20,6 +20,10 @@ if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)
endif()
# Dynarmic
+if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut)
+ add_subdirectory(oaknut)
+endif()
+
if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)
set(DYNARMIC_IGNORE_ASSERTS ON)
add_subdirectory(dynarmic)
@@ -189,7 +193,7 @@ if (ANDROID)
endif()
endif()
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if (UNIX AND NOT APPLE)
add_subdirectory(gamemode)
endif()
diff --git a/externals/nx_tzdb/tzdb_to_nx b/externals/nx_tzdb/tzdb_to_nx
-Subproject 0d17dd066d91f954a4c89d46dcb067eead6b1e4
+Subproject f6680093bca30265c161581fd813d4ddd33f1e3
diff --git a/externals/oaknut b/externals/oaknut
new file mode 160000
+Subproject 918bd94f025d6a2de13978468351598997ae390