From 015358dadc25c8124388c188305f24715824d51a Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Mon, 28 Jul 2025 02:02:19 -0400
Subject: [PATCH] [cmake] zycore-c -> CPM

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 .gitmodules                                 | 3 ---
 CMakeLists.txt                              | 3 ++-
 externals/dynarmic/externals/CMakeLists.txt | 8 +++++++-
 externals/dynarmic/externals/zycore-c       | 1 -
 4 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 160000 externals/dynarmic/externals/zycore-c

diff --git a/.gitmodules b/.gitmodules
index b65d464496..da1ef8fde3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,9 +25,6 @@
 [submodule "externals/dynarmic/externals/fmt"]
 	path = externals/dynarmic/externals/fmt
 	url = https://github.com/fmtlib/fmt.git
-[submodule "externals/dynarmic/externals/zycore-c"]
-	path = externals/dynarmic/externals/zycore-c
-	url = https://github.com/zyantific/zycore-c.git
 [submodule "externals/nx_tzdb/tzdb_to_nx/externals/tz/tz"]
 	path = externals/nx_tzdb/tzdb_to_nx/externals/tz/tz
 	url = https://github.com/eggert/tz.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1118ce7103..5e11553d9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,8 @@ if (YUZU_USE_BUNDLED_VCPKG)
     CPMAddPackage(
         NAME vcpkg
         DOWNLOAD_ONLY YES
-        URL "https://github.com/microsoft/vcpkg/archive/ea2a964f93.zip"
+        GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git"
+        GIT_TAG ea2a964f93
     )
 
     include(${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake)
diff --git a/externals/dynarmic/externals/CMakeLists.txt b/externals/dynarmic/externals/CMakeLists.txt
index 653150309b..772f51535b 100644
--- a/externals/dynarmic/externals/CMakeLists.txt
+++ b/externals/dynarmic/externals/CMakeLists.txt
@@ -1,4 +1,5 @@
 include(CPM)
+set(CPM_USE_LOCAL_PACKAGES ON)
 
 # Always build externals as static libraries, even when dynarmic is built as shared
 if (BUILD_SHARED_LIBS)
@@ -89,9 +90,14 @@ CPMAddPackage(
         "ZYDIS_BUILD_DOXYGEN OFF"
 )
 
+CPMAddPackage(
+    NAME Zycore
+    URL "https://github.com/zyantific/zycore-c/archive/75a36c45ae.zip"
+)
+
 if (Zydis_ADDED)
     if ("x86_64" IN_LIST ARCHITECTURE)
-        set(ZYAN_ZYCORE_PATH "${CMAKE_CURRENT_LIST_DIR}/zycore-c" CACHE PATH "")
+        set(ZYAN_ZYCORE_PATH "${Zycore_SOURCE_DIR}" CACHE PATH "")
         set(CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON)
     endif()
 endif()
diff --git a/externals/dynarmic/externals/zycore-c b/externals/dynarmic/externals/zycore-c
deleted file mode 160000
index 75a36c45ae..0000000000
--- a/externals/dynarmic/externals/zycore-c
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75a36c45ae1ad382b0f4e0ede0af84c11ee69928