summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZephyron <zephyron@citron-emu.org>2025-02-08 19:13:51 +1000
committerMike Lothian <mike@fireburn.co.uk>2025-05-11 14:54:45 +0100
commita9b15107e18003798b7870bc45d413c4deea41a5 (patch)
tree7e2f904012cbd76288a130a83160a4d99ec7c3cb
parenta51362fe01e3aa2a787546789d4a6c7c96b394f1 (diff)
build: update dependencies and relax version requirements
- Update Vulkan validation layers to 1.4.304.1 - Update Qt to 6.8.2 - Remove strict version requirements for various dependencies - Update Vulkan-Headers, VulkanMemoryAllocator, and vcpkg submodules - Reorganize discord-rpc compile options This change makes the build system more flexible by removing unnecessary version constraints while ensuring compatibility with newer versions of key dependencies.
-rw-r--r--CMakeLists.txt36
m---------externals/Vulkan-Headers0
m---------externals/VulkanMemoryAllocator0
3 files changed, 18 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5897da76f..93c5b12ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,12 +106,12 @@ endif()
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
- set(vvl_version "sdk-1.3.261.1")
+ set(vvl_version "vulkan-sdk-1.4.304.1")
set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
if (NOT EXISTS "${vvl_zip_file}")
# Download and extract validation layer release to externals directory
set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
- file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
+ file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-1.4.304.1.zip"
"${vvl_zip_file}" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
@@ -334,7 +334,7 @@ if (YUZU_USE_LLVM_DEMANGLE)
endif()
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
- find_package(VulkanHeaders 1.4.306 REQUIRED)
+ find_package(VulkanHeaders 1.4.304.1 REQUIRED)
endif()
if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
@@ -347,19 +347,19 @@ if (NOT YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS)
endif()
if (ENABLE_LIBUSB)
- find_package(libusb 1.0.24 MODULE)
+ find_package(libusb MODULE)
endif()
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
- find_package(xbyak 7 CONFIG)
+ find_package(xbyak CONFIG)
endif()
if (ARCHITECTURE_arm64)
- find_package(oaknut 2.0.1 CONFIG)
+ find_package(oaknut CONFIG)
endif()
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
- find_package(dynarmic 6.4.0 CONFIG)
+ find_package(dynarmic CONFIG)
endif()
if (ENABLE_CUBEB)
@@ -371,15 +371,15 @@ if (USE_DISCORD_PRESENCE)
endif()
if (ENABLE_WEB_SERVICE)
- find_package(cpp-jwt 1.4 CONFIG)
+ find_package(cpp-jwt CONFIG)
endif()
if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
- find_package(httplib 0.12 MODULE COMPONENTS OpenSSL)
+ find_package(httplib MODULE COMPONENTS OpenSSL)
endif()
if (YUZU_TESTS)
- find_package(Catch2 3.0.1 REQUIRED)
+ find_package(Catch2 REQUIRED)
endif()
# boost:asio has functions that require AcceptEx et al
@@ -388,11 +388,11 @@ if (MINGW)
endif()
if(ENABLE_OPENSSL)
- find_package(OpenSSL 1.1.1 REQUIRED)
+ find_package(OpenSSL REQUIRED)
endif()
if (UNIX AND NOT APPLE)
- find_package(gamemode 1.7 MODULE)
+ find_package(gamemode MODULE)
endif()
# Please consider this as a stub
@@ -431,9 +431,13 @@ endif()
add_subdirectory(externals)
+if (USE_DISCORD_PRESENCE)
+ target_compile_options(discord-rpc PRIVATE -fpermissive)
+endif()
+
if (ENABLE_QT)
if (NOT USE_SYSTEM_QT)
- download_qt(6.8.1)
+ download_qt(6.8.2)
endif()
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent Network)
@@ -499,7 +503,7 @@ endif()
if (NOT YUZU_USE_BUNDLED_FFMPEG)
# Use system installed FFmpeg
- find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
+ find_package(FFmpeg REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
endif()
if(ENABLE_QT)
@@ -688,7 +692,3 @@ if(ENABLE_QT AND UNIX AND NOT APPLE)
install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml"
DESTINATION "share/metainfo")
endif()
-
-if (USE_DISCORD_PRESENCE)
- target_compile_options(discord-rpc PRIVATE -fpermissive)
-endif()
diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers
-Subproject 39f924b810e561fd86b2558b6711ca68d4363f6
+Subproject 234c4b7370a8ea3239a214c9e871e4b17c89f4a
diff --git a/externals/VulkanMemoryAllocator b/externals/VulkanMemoryAllocator
-Subproject 72c309a83bc1997cf9b3d754d694120c65ce109
+Subproject c788c52156f3ef7bc7ab769cb03c110a53ac8fc