drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-19 10:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: add Qt6 TLS plugin copying to CopyCitronQt6Deps

Browse Source 
- Configure Qt6_TLS_DIR and TLS destination paths
- Copy TLS plugins using windows_copy_files utility
- Support Debug and Release configurations

Signed-off-by: Zephyron <zephyron@citron-emu.org>
This commit is contained in:
Zephyron
2025-11-01 23:17:54 +10:00
parent 5af5ba2d0e
commit d2f2d50e28
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeModules/CopyCitronQt6Deps.cmake
View File

@@ -13,10 +13,12 @@ function(copy_citron_Qt6_deps target_dir)
set(Qt6_PLATFORMS_DIR "${Qt6_DIR}/../../../plugins/platforms/")
set(Qt6_STYLES_DIR "${Qt6_DIR}/../../../plugins/styles/")
set(Qt6_IMAGEFORMATS_DIR "${Qt6_DIR}/../../../plugins/imageformats/")
set(Qt6_TLS_DIR "${Qt6_DIR}/../../../plugins/tls/")
set(Qt6_RESOURCES_DIR "${Qt6_DIR}/../../../resources/")
set(PLATFORMS ${DLL_DEST}plugins/platforms/)
set(STYLES ${DLL_DEST}plugins/styles/)
set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/)
set(TLS ${DLL_DEST}tls/)
if (MSVC)
windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
@@ -50,6 +52,11 @@ function(copy_citron_Qt6_deps target_dir)
qjpeg$<$<CONFIG:Debug>:d>.*
qgif$<$<CONFIG:Debug>:d>.*
)
# Copy TLS plugins for SSL/HTTPS support (required for auto updater)
windows_copy_files(citron ${Qt6_TLS_DIR} ${TLS}
qschannelbackend$<$<CONFIG:Debug>:d>.*
qopensslbackend$<$<CONFIG:Debug>:d>.*
)
else()
# Update for non-MSVC platforms if needed
endif()

32
src/citron/CMakeLists.txt
View File

@@ -512,38 +512,6 @@ if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6)
COMMAND ${CMAKE_COMMAND} -E make_directory "${CITRON_EXE_DIR}/user"
COMMENT "Creating portable user directory"
)
# Copy Qt TLS plugins for SSL/TLS support (required for auto updater and HTTPS)
# Qt 6 uses a plugin architecture for TLS backends
if (CITRON_USE_AUTO_UPDATER OR ENABLE_OPENSSL)
set(Qt6_TLS_PLUGINS_DIR "${Qt6_DIR}/../../../plugins/tls")
# Create tls directory
add_custom_command(TARGET citron POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CITRON_EXE_DIR}/tls"
COMMENT "Creating TLS plugin directory for SSL support"
)
# Copy Windows native Schannel backend (no external dependencies)
if (EXISTS "${Qt6_TLS_PLUGINS_DIR}/qschannelbackend.dll")
add_custom_command(TARGET citron POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${Qt6_TLS_PLUGINS_DIR}/qschannelbackend.dll"
"${CITRON_EXE_DIR}/tls/qschannelbackend.dll"
COMMENT "Copying Qt Schannel TLS plugin (Windows native SSL)"
)
endif()
# Copy OpenSSL backend as fallback (requires OpenSSL DLLs)
if (EXISTS "${Qt6_TLS_PLUGINS_DIR}/qopensslbackend.dll")
add_custom_command(TARGET citron POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${Qt6_TLS_PLUGINS_DIR}/qopensslbackend.dll"
"${CITRON_EXE_DIR}/tls/qopensslbackend.dll"
COMMENT "Copying Qt OpenSSL TLS plugin (fallback)"
)
endif()
endif()
endif()
if (CITRON_USE_BUNDLED_QT)