diff --git a/Configuration/Project-MacNE.xcconfig b/Configuration/Project-MacNE.xcconfig index 5e35e5c..f8b9caf 100755 --- a/Configuration/Project-MacNE.xcconfig +++ b/Configuration/Project-MacNE.xcconfig @@ -1,5 +1,4 @@ SUPPORTED_PLATFORMS = macosx -//TARGETED_DEVICE_FAMILY = 1,2 HEADER_SEARCH_PATHS = $(inherited) \ $(SRCROOT)/Sources/OpenVPNAdapter/include \ @@ -12,24 +11,10 @@ HEADER_SEARCH_PATHS = $(inherited) \ CLANG_CXX_LANGUAGE_STANDARD = gnu++14 CLANG_CXX_LIBRARY = libc++ -//////////////////////////////////////////////////////////////////////////////// -// -// iOS-specific settings -// -//IPHONEOS_DEPLOYMENT_TARGET = 10.0 - -//SDKROOT[arch=arm64] = iphoneos -//VALID_ARCHS[sdk=iphoneos*] = arm64 - -//////////////////////////////////////////////////////////////////////////////// -// -// macOS-specific settings -// -MACOSX_DEPLOYMENT_TARGET = 10.15 +MACOSX_DEPLOYMENT_TARGET = 12.0 SDKROOT[arch=x86_64] = macosx -//SDKROOT[arch=arm64] = macosx +SDKROOT[arch=arm64] = macosx -VALID_ARCHS[sdk=macosx*] = x86_64 +VALID_ARCHS[sdk=macosx*] = x86_64 arm64 ARCHS = $(ARCHS_STANDARD) -//EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64 \ No newline at end of file diff --git a/Configuration/amnezia.xcconfig b/Configuration/amnezia.xcconfig index c1fab96..6af6076 100644 --- a/Configuration/amnezia.xcconfig +++ b/Configuration/amnezia.xcconfig @@ -1,5 +1,4 @@ SUPPORTED_PLATFORMS = macosx -//TARGETED_DEVICE_FAMILY = 1,2 HEADER_SEARCH_PATHS = $(inherited) \ $(SRCROOT)/Sources/OpenVPNAdapter/include \ @@ -12,26 +11,13 @@ HEADER_SEARCH_PATHS = $(inherited) \ CLANG_CXX_LANGUAGE_STANDARD = gnu++14 CLANG_CXX_LIBRARY = libc++ -//////////////////////////////////////////////////////////////////////////////// -// -// iOS-specific settings -// -//IPHONEOS_DEPLOYMENT_TARGET = 10.0 - -//SDKROOT[arch=arm64] = iphoneos -//VALID_ARCHS[sdk=iphoneos*] = arm64 - -//////////////////////////////////////////////////////////////////////////////// -// -// macOS-specific settings -// -MACOSX_DEPLOYMENT_TARGET = 10.15 +MACOSX_DEPLOYMENT_TARGET = 12.0 SDKROOT[arch=x86_64] = macosx -//SDKROOT[arch=arm64] = macosx +SDKROOT[arch=arm64] = macosx -VALID_ARCHS[sdk=macosx*] = x86_64 +VALID_ARCHS[sdk=macosx*] = x86_64 arm64 ARCHS = $(ARCHS_STANDARD) -//EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64PROJECT_TEMP_DIR = /Users/macbook/Documents/VPN/dev-branch/amnezia-client/client/3rd/OpenVPNAdapter/build/OpenVPNAdapter.build -CONFIGURATION_BUILD_DIR = /Users/macbook/Documents/VPN/dev-branch/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-macos -BUILT_PRODUCTS_DIR = /Users/macbook/Documents/VPN/dev-branch/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-macos +PROJECT_TEMP_DIR = /Users/macbook/Documents/VPN/dev-branch/new-06112024/amnezia-client/client/3rd/OpenVPNAdapter/build/OpenVPNAdapter.build +CONFIGURATION_BUILD_DIR = /Users/macbook/Documents/VPN/dev-branch/new-06112024/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-macos +BUILT_PRODUCTS_DIR = /Users/macbook/Documents/VPN/dev-branch/new-06112024/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-macos diff --git a/Lib/ios/arm64/ck-ovpn-plugin.a b/Lib/ios/arm64/ck-ovpn-plugin.a index 1ca2508..41f1e7e 100644 Binary files a/Lib/ios/arm64/ck-ovpn-plugin.a and b/Lib/ios/arm64/ck-ovpn-plugin.a differ diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index f41701e..268e513 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 55; objects = { /* Begin PBXBuildFile section */ @@ -106,9 +106,9 @@ OBJ_300 /* OpenVPNTransportStats.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_68 /* OpenVPNTransportStats.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_301 /* OpenVPNSessionToken.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_69 /* OpenVPNSessionToken.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_302 /* OpenVPNCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_70 /* OpenVPNCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; }; - OBJ_304 /* OpenVPNClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::OpenVPNClient::Product" /* OpenVPNClient.framework */; }; - OBJ_324 /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; platformFilter = ios; }; - OBJ_325 /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; platformFilter = ios; }; + OBJ_304 /* OpenVPNClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::OpenVPNClient::Product" /* OpenVPNClient.framework */; platformFilters = (ios, macos, ); }; + OBJ_324 /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; }; + OBJ_325 /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; }; OBJ_332 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_85 /* aes.c */; }; OBJ_333 /* aesni.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_86 /* aesni.c */; }; OBJ_334 /* arc4.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_87 /* arc4.c */; }; @@ -1333,18 +1333,20 @@ }; OBJ_307 /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilters = ( + ios, + macos, + ); target = "OpenVPNAdapter::OpenVPNClient" /* OpenVPNClient */; targetProxy = C9EABF2C2411076400D828D4 /* PBXContainerItemProxy */; }; OBJ_326 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - platformFilter = ios; target = "OpenVPNAdapter::mbedTLS" /* mbedTLS */; targetProxy = C9EABF2A2411076400D828D4 /* PBXContainerItemProxy */; }; OBJ_327 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - platformFilter = ios; target = "OpenVPNAdapter::LZ4" /* LZ4 */; targetProxy = C9EABF2B2411076400D828D4 /* PBXContainerItemProxy */; }; @@ -1570,9 +1572,10 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; + REGISTER_APP_GROUPS = NO; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SUPPORTS_MACCATALYST = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1618,9 +1621,10 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; + REGISTER_APP_GROUPS = NO; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SUPPORTS_MACCATALYST = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1672,6 +1676,7 @@ "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); INFOPLIST_FILE = OpenVPNAdapter.xcodeproj/OpenVPNClient_Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", @@ -1689,10 +1694,13 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; + REGISTER_APP_GROUPS = NO; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SUPPORTS_MACCATALYST = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNClient; VALID_ARCHS = "arm64 x86_64"; a = ""; @@ -1715,6 +1723,7 @@ "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); INFOPLIST_FILE = OpenVPNAdapter.xcodeproj/OpenVPNClient_Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", @@ -1732,10 +1741,13 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; + REGISTER_APP_GROUPS = NO; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SUPPORTS_MACCATALYST = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNClient; VALID_ARCHS = "arm64 x86_64"; "VALID_ARCHS[sdk=iphoneos*]" = x86_64;