diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index 59949cd3..0bfafb48 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -1,13 +1,13 @@ message("Client ==> iOS build") # Đường dẫn tới thư mục chứa HevSocks5Tunnel.xcframework -set(HEV_SOCKS5_TUNNEL_PATH "/Users/anhviet/Documents/VPN/new/amnezia-client/client/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework") +set(HEV_SOCKS5_TUNNEL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/xray") # Đường dẫn tới thư viện .a -set(HEV_SOCKS5_TUNNEL_LIB "${HEV_SOCKS5_TUNNEL_PATH}/ios-arm64/libhev-socks5-tunnel.a") +set(HEV_SOCKS5_TUNNEL_LIB "${HEV_SOCKS5_TUNNEL_PATH}/ios/libhev-socks5-tunnel.a") # Đường dẫn tới tệp header -set(HEV_SOCKS5_TUNNEL_INCLUDE_DIR "${HEV_SOCKS5_TUNNEL_PATH}/ios-arm64/Headers") +set(HEV_SOCKS5_TUNNEL_INCLUDE_DIR "${HEV_SOCKS5_TUNNEL_PATH}/ios/Headers") # Thêm tệp header vào include directories target_include_directories(${PROJECT} PRIVATE ${HEV_SOCKS5_TUNNEL_INCLUDE_DIR}) diff --git a/client/ios/scripts/openvpn.sh b/client/ios/scripts/openvpn.sh index 75a89ac0..704807be 100755 --- a/client/ios/scripts/openvpn.sh +++ b/client/ios/scripts/openvpn.sh @@ -9,13 +9,15 @@ PATCH="/usr/bin/patch" BUILT_PRODUCTS_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-iphoneos EOF +# Lấy phiên bản SDK macOS hiện tại +MACOSX_SDK=$(xcodebuild -showsdks | grep macosx | sed -E 's/.*macosx([0-9]+\.[0-9]+).*/macosx\1/') - cd 3rd/OpenVPNAdapter - if $XCODEBUILD -scheme OpenVPNAdapter -configuration Release -xcconfig Configuration/amnezia.xcconfig -sdk macosx14.5 -destination 'generic/platform=MacOS' -project OpenVPNAdapter.xcodeproj ; then - echo "OpenVPNAdapter built successfully" - else - echo "OpenVPNAdapter build failed" - fi +cd 3rd/OpenVPNAdapter +if $XCODEBUILD -scheme OpenVPNAdapter -configuration Release -xcconfig Configuration/amnezia.xcconfig -sdk $MACOSX_SDK -destination 'generic/platform=MacOS' -project OpenVPNAdapter.xcodeproj ; then + echo "OpenVPNAdapter built successfully" +else + echo "OpenVPNAdapter build failed ..." +fi - rm -rf ./build/Release-iphoneos/OpenVPNAdapter.framework/Versions/A/_CodeSignature - cd ../../ +rm -rf ./build/Release-iphoneos/OpenVPNAdapter.framework/Versions/A/_CodeSignature +cd ../../