[cmake] zycore-c -> CPM
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
parent
c3c04b17c9
commit
015358dadc
4 changed files with 9 additions and 6 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
8
externals/dynarmic/externals/CMakeLists.txt
vendored
8
externals/dynarmic/externals/CMakeLists.txt
vendored
|
@ -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()
|
||||
|
|
1
externals/dynarmic/externals/zycore-c
vendored
1
externals/dynarmic/externals/zycore-c
vendored
|
@ -1 +0,0 @@
|
|||
Subproject commit 75a36c45ae1ad382b0f4e0ede0af84c11ee69928
|
Loading…
Add table
Add a link
Reference in a new issue