mirrors/Citron
1
0
Fork 0
mirror of https://git.citron-emu.org/Citron/Citron.git synced 2025-03-15 03:14:50 +00:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

build: update dependencies and relax version requirements

Browse source 
- 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.
This commit is contained in:
Zephyron 2025-02-08 19:13:51 +10:00
parent d4eca46bba
commit 7b6495aced
No known key found for this signature in database
4 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
CMakeLists.txt
View file

@ -98,12 +98,12 @@ endif()
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
if (ANDROID AND CITRON_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")
@ -327,7 +327,7 @@ find_package(ZLIB REQUIRED)
find_package(zstd REQUIRED)
if (NOT CITRON_USE_EXTERNAL_VULKAN_HEADERS)
find_package(VulkanHeaders 1.4.306 REQUIRED)
find_package(VulkanHeaders 1.4.304.1 REQUIRED)
endif()
if (NOT CITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
@ -335,19 +335,19 @@ if (NOT CITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
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 6 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)
@ -359,12 +359,12 @@ if (USE_DISCORD_PRESENCE)
endif()
if (ENABLE_WEB_SERVICE)
find_package(cpp-jwt 1.4 CONFIG)
find_package(httplib 0.12 MODULE COMPONENTS OpenSSL)
find_package(cpp-jwt CONFIG)
find_package(httplib MODULE COMPONENTS OpenSSL)
endif()
if (CITRON_TESTS)
find_package(Catch2 3.0.1 REQUIRED)
find_package(Catch2 REQUIRED)
endif()
# boost:asio has functions that require AcceptEx et al
@ -373,11 +373,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
@ -416,10 +416,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.7.3)
download_qt(6.8.2)
endif()
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent Network)
@ -484,7 +487,7 @@ list(APPEND CITRON_QT_COMPONENTS2 Multimedia)
endif()
if (NOT CITRON_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)
@ -673,7 +676,3 @@ if(ENABLE_QT AND UNIX AND NOT APPLE)
install(FILES "dist/org.citron_emu.citron.metainfo.xml"
DESTINATION "share/metainfo")
endif()
if (USE_DISCORD_PRESENCE)
target_compile_options(discord-rpc PRIVATE -fpermissive)
endif()

2
externals/Vulkan-Headers vendored

@ -1 +1 @@
Subproject commit 39f924b810e561fd86b2558b6711ca68d4363f68
Subproject commit 234c4b7370a8ea3239a214c9e871e4b17c89f4ab

2
externals/VulkanMemoryAllocator vendored

@ -1 +1 @@
Subproject commit 72c309a83bc1997cf9b3d754d694120c65ce109c
Subproject commit c788c52156f3ef7bc7ab769cb03c110a53ac8fcb

2
externals/vcpkg vendored

@ -1 +1 @@
Subproject commit 561cf50a731761f9890fb720f830cb3501b8472d
Subproject commit 74ec888e385d189b42d6b398d0bbaa6f1b1d3b0e