From 2c54fe77769a36e8a0a72c15d5863ae8179b0471 Mon Sep 17 00:00:00 2001
From: Macbook <macbook@MacBook-Pro-cua-Macbook.local>
Date: Thu, 24 Oct 2024 19:12:49 +0700
Subject: [PATCH] update

---
 client/3rd/OpenVPNAdapter  |  2 +-
 client/3rd/amneziawg-apple |  2 +-
 client/CMakeLists.txt      | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/3rd/OpenVPNAdapter b/client/3rd/OpenVPNAdapter
index 33afba08..c3fa3e8f 160000
--- a/client/3rd/OpenVPNAdapter
+++ b/client/3rd/OpenVPNAdapter
@@ -1 +1 @@
-Subproject commit 33afba081c8592e8632128c7f9d6ebe53cae3d08
+Subproject commit c3fa3e8f1c3ae92e3ebb39b38451a29aa79dbd01
diff --git a/client/3rd/amneziawg-apple b/client/3rd/amneziawg-apple
index 76e7db55..39ffdb6e 160000
--- a/client/3rd/amneziawg-apple
+++ b/client/3rd/amneziawg-apple
@@ -1 +1 @@
-Subproject commit 76e7db556a6d7e2582f9481df91db188a46c009c
+Subproject commit 39ffdb6e71091bf5b5e456c02e6344a2d930b062
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 74c945e9..cf057fce 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -425,19 +425,20 @@ endif()
 
 target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
 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
         COMMAND ${CMAKE_COMMAND} -E make_directory
-        "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks"
-
+                "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks"
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-        "$ENV{QT_HOST_PATH}/lib/QtConcurrent.framework"
-        "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/QtConcurrent.framework"
-
-        COMMENT "Copying QtConcurrent.framework from QT_HOST_PATH to the bundle's Frameworks directory"
+                "$ENV{QT_MACOS_ROOT_DIR}/lib/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"
     )
 
 
+
     # MacOS specific application deployment
     add_custom_command(TARGET ${PROJECT} POST_BUILD
         COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:AmneziaVPN> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR}