AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add qtmultimedia

Browse source
This commit is contained in:
Macbook 2024-10-09 21:16:57 +07:00
parent 226f9b9316
commit 0500f1887c
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/deploy.yml vendored
View file

@ -316,7 +316,7 @@ jobs:
host: 'mac' host: 'mac'
target: 'desktop' target: 'desktop'
arch: 'clang_64' arch: 'clang_64'
modules: 'qtremoteobjects qt5compat qtshadertools' modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
dir: ${{ runner.temp }} dir: ${{ runner.temp }}
set-env: 'true' set-env: 'true'
extra: '--external 7z --base ${{ env.QT_MIRROR }}' extra: '--external 7z --base ${{ env.QT_MIRROR }}'

48
client/CMakeLists.txt
View file

@ -424,34 +424,34 @@ if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE)
endif() endif()
target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC}) target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
# if(APPLE AND NOT ANDROID) if(MACOS_NE)
# # MacOS specific bundle operations # MacOS specific bundle operations
# add_custom_command(TARGET ${PROJECT} POST_BUILD add_custom_command(TARGET ${PROJECT} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
# "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks" "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks"
# COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
# "/Users/macbook/Qt/6.8.0/macos/lib/QtConcurrent.framework" "/Users/macbook/Qt/6.8.0/macos/lib/QtConcurrent.framework"
# "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/QtConcurrent.framework" "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/QtConcurrent.framework"
# COMMENT "Copying QtConcurrent.framework to the bundle's Frameworks directory" COMMENT "Copying QtConcurrent.framework to the bundle's Frameworks directory"
# ) )
# # MacOS specific application deployment # MacOS specific application deployment
# add_custom_command(TARGET ${PROJECT} POST_BUILD add_custom_command(TARGET ${PROJECT} POST_BUILD
# COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:AmneziaVPN> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:AmneziaVPN> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR}
# ) )
# # MacOS specific code signing for Release # MacOS specific code signing for Release
# if(CMAKE_BUILD_TYPE STREQUAL "Release") if(CMAKE_BUILD_TYPE STREQUAL "Release")
# SET(SIGN_CMD codesign --deep --force --sign 'Apple Distribution: Privacy Technologies OU \(X7UJ388FXK\)' --timestamp --options runtime $<TARGET_BUNDLE_DIR:AmneziaVPN>) SET(SIGN_CMD codesign --deep --force --sign 'Apple Distribution: Privacy Technologies OU \(X7UJ388FXK\)' --timestamp --options runtime $<TARGET_BUNDLE_DIR:AmneziaVPN>)
# message("Manual signing bundle...") message("Manual signing bundle...")
# message(${SIGN_CMD}) message(${SIGN_CMD})
# add_custom_command(TARGET ${PROJECT} POST_BUILD add_custom_command(TARGET ${PROJECT} POST_BUILD
# COMMAND ${SIGN_CMD} COMMAND ${SIGN_CMD}
# ) )
# endif() endif()
# endif() endif()
qt_finalize_target(${PROJECT}) qt_finalize_target(${PROJECT})