5 files changed, 8 insertions, 16 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 40ec20f3d..407c5c640 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,8 +193,10 @@ if (ANDROID)
    endif()
 endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    add_subdirectory(gamemode)
+if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers)
+    add_library(gamemode INTERFACE)
+    target_include_directories(gamemode INTERFACE gamemode)
+    add_library(gamemode::headers ALIAS gamemode)
 endif()
 
 # Breakpad
diff --git a/externals/gamemode/CMakeLists.txt b/externals/gamemode/CMakeLists.txt
deleted file mode 100644
index 87095642e..000000000
--- a/externals/gamemode/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-project(gamemode LANGUAGES CXX C)
-
-add_library(gamemode include/gamemode_client.h)
-
-target_link_libraries(gamemode PRIVATE common)
-
-target_include_directories(gamemode PUBLIC include)
-set_target_properties(gamemode PROPERTIES LINKER_LANGUAGE C)
diff --git a/externals/gamemode/include/gamemode_client.h b/externals/gamemode/gamemode_client.h
index 184812334..b9f64fe46 100644
--- a/externals/gamemode/include/gamemode_client.h
+++ b/externals/gamemode/gamemode_client.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2017-2019 Feral Interactive
-// SPDX-License-Identifier: BSD-3-Clause
-
 /*
 
 Copyright (c) 2017-2019, Feral Interactive
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