1 files changed, 7 insertions, 43 deletions
diff --git a/src/dynarmic/externals/CMakeLists.txt b/src/dynarmic/externals/CMakeLists.txt
index 26f9290ed8..ea666ddc52 100644
--- a/src/dynarmic/externals/CMakeLists.txt
+++ b/src/dynarmic/externals/CMakeLists.txt
@@ -1,5 +1,6 @@
-# Explicitly include CPMUtil here since we have a separate cpmfile for dynarmic
-set(CPMUTIL_JSON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cpmfile.json)
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 include(CPMUtil)
 
 # Always build externals as static libraries, even when dynarmic is built as shared
@@ -20,62 +21,25 @@ set(BUILD_TESTING OFF)
 # biscuit
 
 if ("riscv" IN_LIST ARCHITECTURE)
-    add_subdirectory(biscuit)
-
     AddJsonPackage(
         NAME biscuit
         BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
     )
 endif()
 
-# catch
-
-# if (NOT TARGET Catch2::Catch2WithMain)
-#     if (DYNARMIC_TESTS)
-#         find_package(Catch2 3.0.1 REQUIRED)
-#     endif()
-# endif()
-
-# fmt
-
-# if (NOT TARGET fmt::fmt)
-#     # fmtlib formatting library
-#     set(FMT_INSTALL ON)
-#     add_subdirectory(fmt)
-# endif()
-
 # mcl
 AddJsonPackage(
     NAME mcl
     BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
 )
 
-# oaknut
-
-# if (NOT TARGET merry::oaknut)
-#     if ("arm64" IN_LIST ARCHITECTURE)
-#         add_subdirectory(oaknut)
-#     elseif (DYNARMIC_TESTS)
-#         add_subdirectory(oaknut EXCLUDE_FROM_ALL)
-#     endif()
-# endif()
-
-# xbyak
-# uncomment if in an independent repo
-
-# if (NOT TARGET xbyak::xbyak)
-#     if ("x86_64" IN_LIST ARCHITECTURE)
-#         add_subdirectory(xbyak)
-#     endif()
-# endif()
-
-# zydis
-
 # TODO(crueter): maybe it's just Gentoo but zydis system package really sucks
 if ("x86_64" IN_LIST ARCHITECTURE)
     set(CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON)
-    # TODO(crueter): system zycore doesn't work with zydis
-    AddJsonPackage(zycore)
+    AddJsonPackage(
+        NAME zycore
+        BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
+    )
 
     AddJsonPackage(
         NAME zydis