[cmake] xbyak -> CPM

Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-07-30 16:15:58 -04:00
parent 56fadad889
commit 3340ce7b9e
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 8 additions and 14 deletions

View file

@ -409,14 +409,6 @@ find_package(VulkanMemoryAllocator CONFIG)
find_package(ZLIB 1.2 REQUIRED)
find_package(zstd 1.5 REQUIRED)
# if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
# find_package(VulkanHeaders 1.3.274 REQUIRED)
# endif()
# if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
# find_package(VulkanUtilityLibraries REQUIRED)
# endif()
# TODO(crueter): Work around this
if (NOT YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS)
find_package(PkgConfig REQUIRED)
@ -431,10 +423,6 @@ if (ENABLE_LIBUSB)
endif()
endif()
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
find_package(xbyak 7 CONFIG)
endif()
if (ARCHITECTURE_arm64)
find_package(oaknut 2.0.1 CONFIG)
endif()

View file

@ -21,8 +21,14 @@ set(BUILD_SHARED_LIBS OFF)
set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
# Xbyak (also used by Dynarmic, so needs to be added first)
if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)
add_subdirectory(xbyak)
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
set(CPM_USE_LOCAL_PACKAGES OFF)
CPMAddPackage(
NAME xbyak
URL "https://github.com/Lizzie841/xbyak/archive/4e44f4614d.zip"
URL_HASH SHA512=5824e92159e07fa36a774aedd3b3ef3541d0241371d522cffa4ab3e1f215fa5097b1b77865b47b2481376c704fa079875557ea463ca63d0a7fd6a8a20a589e70
)
endif()
# Oaknut (also used by Dynarmic, so needs to be added first)