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

archive success

Browse source
This commit is contained in:
Macbook 2024-11-08 21:09:15 +07:00
parent 4532a9114f
commit 599dad87a7
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/3rd-prebuilt

@ -1 +1 @@
Subproject commit 435aaa793d8ce455ef4a3b2f5ff5e38f187d8efb Subproject commit 529178b87eb25f4fd630fa053298707f601b33e3

2
client/3rd/OpenVPNAdapter vendored

@ -1 +1 @@
Subproject commit d10da3661d9ff41725b75292d6a451763e997415 Subproject commit e1e20dd02ea87ff850f0f86cb7dc8afa7cb42b51

8
client/cmake/macos_ne.cmake
View file

@ -137,3 +137,11 @@ message("QtCore_location")
message(${QtCore_location}) message(${QtCore_location})
get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE) get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE)
set_property(TARGET ${PROJECT} PROPERTY XCODE_EMBED_FRAMEWORKS
"${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework"
)
set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-macos)
target_link_libraries("networkextension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework")

28
client/macos/networkextension/CMakeLists.txt
View file

@ -86,23 +86,23 @@ find_library(FW_LIBRESOLV libresolv.9.tbd)
set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
set(CMAKE_FRAMEWORK_PATH ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos) set(CMAKE_FRAMEWORK_PATH ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos)
message("CMAKE_FRAMEWORK_PATH is: ${CMAKE_FRAMEWORK_PATH}") # message("CMAKE_FRAMEWORK_PATH is: ${CMAKE_FRAMEWORK_PATH}")
# framework OpenVPNAdapter # # framework OpenVPNAdapter
set_property(TARGET networkextension PROPERTY XCODE_EMBED_FRAMEWORKS # # set_property(TARGET networkextension PROPERTY XCODE_EMBED_FRAMEWORKS
${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework # # ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
) # # )
target_link_libraries(networkextension PRIVATE # target_link_libraries(networkextension PRIVATE
${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework # ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
) # )
target_include_directories(networkextension PRIVATE # target_include_directories(networkextension PRIVATE
${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework/Headers # ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework/Headers
) # )
target_link_libraries(networkextension PRIVATE # target_link_libraries(networkextension PRIVATE
"-framework OpenVPNAdapter" # "-framework OpenVPNAdapter"
) # )
target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV}) target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV})