From afd129a4022519528e1e15e803cb8040290b61bf Mon Sep 17 00:00:00 2001 From: Macbook Date: Sat, 19 Oct 2024 21:15:44 +0700 Subject: [PATCH] Clean build file --- .gitmodules.swp | Bin 12288 -> 0 bytes client/cmake/macos_ne.cmake | 1 - client/macos/networkextension/CMakeLists.txt | 40 +++---------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 .gitmodules.swp diff --git a/.gitmodules.swp b/.gitmodules.swp deleted file mode 100644 index b195fc11e074b4604779f9277cc7d57a95aa82d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2Pixdb7{=fBAQW0HDtJw|7d^~QZ4v)~hpH$FtCiA%h{$9zyBRjgjFU;bE2!Yj zk0PGD_!;~NdJ?~hZ`#=HuF0}J$-+DEFbVU_%#+__4@=%~WB+j{xZU0WY^wl+o9BAp zAFaaT8bB&!XiUExnc6x+-a{YTafZo4FuX74wG$&na%$%LYC-=2=JlhW`g&_ExO8#v ztgDcp2oM1xKm>>Y5g-CYfCvzQIVRxk0(`*yi`6q+uKI>Y5g-CY zfCvx)B0vO)01=o&0wMy~UIzG#D!>2#{r~^t0>C%aJJbu*4b&CXuk!$3QJ+vxP*+jQ zsGlnUUr--WuTj@fi>Tk#+DGfpAs>oN1c(3;AOb{y2oM1xKm>@ue;}|_xFon6#NONd z4(C`I92a3*n)IY-_`qiT`L0fFqVBt)^`c23&JS4$Jeu*0o>`S) Xo&0trET(OWH}0y7Sibt>E{ypHtwCrB diff --git a/client/cmake/macos_ne.cmake b/client/cmake/macos_ne.cmake index 938e7706..69617ea4 100644 --- a/client/cmake/macos_ne.cmake +++ b/client/cmake/macos_ne.cmake @@ -106,7 +106,6 @@ target_compile_options(${PROJECT} PRIVATE set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/amneziawg-apple/Sources) target_sources(${PROJECT} PRIVATE -# ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosvpnprotocol.swift ${WG_APPLE_SOURCE_DIR}/WireGuardKitC/x25519.c ${CLIENT_ROOT_DIR}/platforms/ios/LogController.swift ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift diff --git a/client/macos/networkextension/CMakeLists.txt b/client/macos/networkextension/CMakeLists.txt index d8716681..ec20146a 100644 --- a/client/macos/networkextension/CMakeLists.txt +++ b/client/macos/networkextension/CMakeLists.txt @@ -13,7 +13,6 @@ if(MACOS_NE) message("MACOS_NE is ON") add_definitions(-DQ_OS_IOS) add_definitions(-DMACOS_NE) - message("Add macros for MacOS Network Extension") else() message("MACOS_NE is OFF") endif() @@ -22,8 +21,6 @@ set_target_properties(networkextension PROPERTIES XCODE_PRODUCT_TYPE com.apple.product-type.app-extension BUNDLE_EXTENSION appex - #MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist - MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}" XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension" @@ -40,14 +37,14 @@ set_target_properties(networkextension PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../Frameworks" XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic - # #XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual + #XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - # #XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution: Privacy Technologies OU (X7UJ388FXK)" - # #XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" + #XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution: Privacy Technologies OU (X7UJ388FXK)" + #XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" - # #XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "Mac AppStore AmneziaVPN.network-extension" - # #XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "Mac AppStore AmneziaVPN.network-extension" + #XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "Mac AppStore AmneziaVPN.network-extension" + #XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "Mac AppStore AmneziaVPN.network-extension" XCODE_ATTRIBUTE_INFOPLIST_FILE "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../../../Frameworks @loader_path/../../../../Frameworks" @@ -91,26 +88,6 @@ find_library(FW_MOBILE_CORE MobileCoreServices) find_library(FW_UI_KIT UIKit) find_library(FW_LIBRESOLV libresolv.9.tbd) -# set(OpenVPNAdapter_DIR "${CLIENT_ROOT_DIR}/3rd/") - -# find_library(OPENVPN_ADAPTER_LIBRARY OpenVPNAdapter PATHS ${OpenVPNAdapter_DIR}) -# target_link_libraries(networkextension PRIVATE ${OPENVPN_ADAPTER_LIBRARY}) - -# add_custom_command(TARGET networkextension PRE_BUILD -# COMMAND ${CMAKE_COMMAND} -E make_directory $/../Frameworks -# ) - - -# add_custom_command(TARGET networkextension POST_BUILD -# COMMAND ${CMAKE_COMMAND} -E echo "Copying ${OPENVPN_ADAPTER_LIBRARY} to $/../Frameworks/" -# COMMAND ${CMAKE_COMMAND} -E copy_if_different -# ${OPENVPN_ADAPTER_LIBRARY} -# $/../Frameworks/ -# COMMAND ${CMAKE_COMMAND} -E echo "Copy complete" -# ) - - - # Set the root directory set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) @@ -126,11 +103,6 @@ set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS "${CLIENT_ROOT_DIR}/3rd/OpenVPN # Linking the framework using CLIENT_ROOT_DIR target_link_libraries("networkextension" PRIVATE "${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework") - - -#target_link_libraries(networkextension PRIVATE ${FW_ASSETS_LIBRARY}) -#target_link_libraries(networkextension PRIVATE ${FW_MOBILE_CORE}) -#target_link_libraries(networkextension PRIVATE ${FW_UI_KIT}) target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV}) target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\") @@ -199,8 +171,6 @@ target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/macos/x86_64/libwg-go.a) -# Print the root directory for debugging purposes -message("---------") message(${CLIENT_ROOT_DIR}) message(${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a) target_link_libraries("networkextension" PRIVATE "${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a")