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

update

Browse source
This commit is contained in:
Macbook 2024-10-24 19:12:49 +07:00
parent d0b85813c7
commit 2c54fe7776
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/3rd/OpenVPNAdapter vendored

@ -1 +1 @@
Subproject commit 33afba081c8592e8632128c7f9d6ebe53cae3d08 Subproject commit c3fa3e8f1c3ae92e3ebb39b38451a29aa79dbd01

2
client/3rd/amneziawg-apple vendored

@ -1 +1 @@
Subproject commit 76e7db556a6d7e2582f9481df91db188a46c009c Subproject commit 39ffdb6e71091bf5b5e456c02e6344a2d930b062

11
client/CMakeLists.txt
View file

@ -425,19 +425,20 @@ endif()
target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC}) target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
if(MACOS_NE) if(MACOS_NE)
# MacOS specific bundle operations message("Copy MacOS Network Extension files")
message("QT_HOST_PATH: $ENV{QT_MACOS_ROOT_DIR}")
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
"$ENV{QT_HOST_PATH}/lib/QtConcurrent.framework" "$ENV{QT_MACOS_ROOT_DIR}/lib/QtConcurrent.framework"
"$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/QtConcurrent.framework" "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/QtConcurrent.framework"
COMMENT "Copying QtConcurrent.framework from QT_MACOS_ROOT_DIR to the bundle's Frameworks directory"
COMMENT "Copying QtConcurrent.framework from QT_HOST_PATH 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}