From 06bf3e5e90221caf0a45dd2bc39bc799d0307c6a Mon Sep 17 00:00:00 2001 From: Macbook Date: Wed, 9 Oct 2024 14:58:53 +0700 Subject: [PATCH] update all lib --- client/macos/scripts/openvpn.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/macos/scripts/openvpn.sh b/client/macos/scripts/openvpn.sh index 1a0bba47..8c371618 100644 --- a/client/macos/scripts/openvpn.sh +++ b/client/macos/scripts/openvpn.sh @@ -4,10 +4,10 @@ XCODEBUILD="/usr/bin/xcodebuild" WORKINGDIR=`pwd` PATCH="/usr/bin/patch" -echo "Building OpenVPNAdapter for macOS ..." +echo "Building OpenVPNAdapter for macOS Network Extension (MacNE)..." -# Copy the Project.xcconfig settings to amnezia.xcconfig -cat $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/Project.xcconfig > $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig +# Copy the Project-MacNE.xcconfig settings to amnezia.xcconfig +cat $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/Project-MacNE.xcconfig > $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig # Append macOS-specific build directory configurations to amnezia.xcconfig cat << EOF >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig @@ -16,8 +16,8 @@ CONFIGURATION_BUILD_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-macos BUILT_PRODUCTS_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-macos EOF -# Add LDFLAGS for macOS, exclude UIKit which is for iOS only -echo "OTHER_LDFLAGS = -framework Cocoa" >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig +# Exclude UIKit, include Cocoa for macOS +# echo "OTHER_LDFLAGS = -framework Cocoa" >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig # Fetch the current macOS SDK version dynamically MACOSX_SDK=$(xcrun --sdk macosx --show-sdk-path | sed -E 's/.*MacOSX([0-9]+\.[0-9]+)\.sdk/\1/') @@ -28,9 +28,9 @@ cd 3rd/OpenVPNAdapter # Build for macOS using the correct SDK and destination if $XCODEBUILD -scheme OpenVPNAdapter -configuration Release -xcconfig Configuration/amnezia.xcconfig -sdk macosx$MACOSX_SDK -destination 'generic/platform=macOS' -project OpenVPNAdapter.xcodeproj ; then - echo "OpenVPNAdapter built successfully for macOS" + echo "OpenVPNAdapter built successfully for macOS Network Extension (MacNE)" else - echo "OpenVPNAdapter macOS build failed ..." + echo "OpenVPNAdapter macOS Network Extension (MacNE) build failed..." fi # Remove CodeSignature if needed for macOS