diff --git a/Configuration/amnezia.xcconfig b/Configuration/amnezia.xcconfig index 25bdd40..645bf13 100644 --- a/Configuration/amnezia.xcconfig +++ b/Configuration/amnezia.xcconfig @@ -30,6 +30,6 @@ VALID_ARCHS[sdk=iphoneos*] = arm64 //SDKROOT[arch=x86_64] = macosx // //VALID_ARCHS[sdk=macosx*] = i386 x86_64 - PROJECT_TEMP_DIR = /Users/anhviet/Documents/VPN/amnezia-client/client/3rd/OpenVPNAdapter/build/OpenVPNAdapter.build - CONFIGURATION_BUILD_DIR = /Users/anhviet/Documents/VPN/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-iphoneos - BUILT_PRODUCTS_DIR = /Users/anhviet/Documents/VPN/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-iphoneos + PROJECT_TEMP_DIR = /Users/administrator/Documents/GitHub/amnezia-client/client/3rd/OpenVPNAdapter/build/OpenVPNAdapter.build + CONFIGURATION_BUILD_DIR = /Users/administrator/Documents/GitHub/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-iphoneos + BUILT_PRODUCTS_DIR = /Users/administrator/Documents/GitHub/amnezia-client/client/3rd/OpenVPNAdapter/build/Release-iphoneos diff --git a/Lib/ios/arm64/ck-ovpn-plugin.a b/Lib/ios/arm64/ck-ovpn-plugin.a index cbc5ff0..1ca2508 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 9392907..5b80853 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 4E51D4962BCE7A63006977DA /* ck-ovpn-plugin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */; }; - 7B7E1EA129E70FB400E76E6D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B7E1EA029E70FB400E76E6D /* UIKit.framework */; }; 7BFD7A8029E5BEF90066D7CC /* ovpncli.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_73 /* ovpncli.mm */; }; C910EAE524EBB1DA0081AF13 /* OpenVPNReachabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FD624123F48005C2EBC /* OpenVPNReachabilityTests.swift */; }; C910EAE724EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h in Headers */ = {isa = PBXBuildFile; fileRef = C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -60,8 +59,8 @@ C97E5FE024123F48005C2EBC /* VPNProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FDA24123F48005C2EBC /* VPNProfile.swift */; }; C97E5FE124123F48005C2EBC /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FDB24123F48005C2EBC /* Bundle.swift */; }; C97E5FE624124B0E005C2EBC /* Umbrella-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5FBA2412344D005C2EBC /* Umbrella-Header.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C97E5FE724124B6F005C2EBC /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; platformFilter = ios; }; - C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; platformFilter = ios; }; + C97E5FE724124B6F005C2EBC /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; }; + C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; }; C9EABF3124110BE200D828D4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9EABF3024110BE200D828D4 /* SystemConfiguration.framework */; }; OBJ_250 /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* lz4.c */; }; OBJ_251 /* lz4frame.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* lz4frame.c */; }; @@ -231,7 +230,6 @@ /* Begin PBXFileReference section */ 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "ck-ovpn-plugin.a"; path = "Lib/ios/arm64/ck-ovpn-plugin.a"; sourceTree = ""; }; - 7B7E1EA029E70FB400E76E6D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = OpenVPNConfigurationEvaluation.h; sourceTree = ""; }; C910EAEB24EBBFB60081AF13 /* client.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = client.crt; sourceTree = ""; }; C910EAEC24EBBFB60081AF13 /* ca.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.crt; sourceTree = ""; }; @@ -510,7 +508,6 @@ buildActionMask = 0; files = ( OBJ_304 /* OpenVPNClient.framework in Frameworks */, - 7B7E1EA129E70FB400E76E6D /* UIKit.framework in Frameworks */, C9EABF3124110BE200D828D4 /* SystemConfiguration.framework in Frameworks */, 4E51D4962BCE7A63006977DA /* ck-ovpn-plugin.a in Frameworks */, C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */, @@ -565,7 +562,6 @@ C9EABF2F24110BE100D828D4 /* Frameworks */ = { isa = PBXGroup; children = ( - 7B7E1EA029E70FB400E76E6D /* UIKit.framework */, 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */, C9EABF3024110BE200D828D4 /* SystemConfiguration.framework */, ); @@ -1327,13 +1323,11 @@ }; C97E5FEA24124B6F005C2EBC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - platformFilter = ios; target = "OpenVPNAdapter::LZ4" /* LZ4 */; targetProxy = C97E5FE924124B6F005C2EBC /* PBXContainerItemProxy */; }; C97E5FEF24124B73005C2EBC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - platformFilter = ios; target = "OpenVPNAdapter::mbedTLS" /* mbedTLS */; targetProxy = C97E5FEE24124B73005C2EBC /* PBXContainerItemProxy */; }; @@ -1416,6 +1410,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1474,6 +1469,7 @@ SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -1504,6 +1500,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = LZ4; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1534,6 +1531,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = LZ4; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -1577,9 +1575,9 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNAdapter; - VALID_ARCHS = arm64; - "VALID_ARCHS[arch=*]" = arm64; - "VALID_ARCHS[sdk=iphoneos*]" = arm64; + VALID_ARCHS = x86_64; + "VALID_ARCHS[arch=*]" = x86_64; + "VALID_ARCHS[sdk=iphoneos*]" = x86_64; }; name = Debug; }; @@ -1623,8 +1621,8 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNAdapter; - VALID_ARCHS = arm64; - "VALID_ARCHS[arch=*]" = arm64; + VALID_ARCHS = x86_64; + "VALID_ARCHS[arch=*]" = x86_64; "VALID_ARCHS[sdk=iphoneos*]" = arm64; }; name = Release; @@ -1692,7 +1690,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNClient; - VALID_ARCHS = arm64; + VALID_ARCHS = x86_64; a = ""; }; name = Debug; @@ -1735,7 +1733,8 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNClient; - VALID_ARCHS = arm64; + VALID_ARCHS = x86_64; + "VALID_ARCHS[sdk=iphoneos*]" = x86_64; a = ""; }; name = Release; @@ -1770,6 +1769,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = mbedTLS; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1803,6 +1803,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = mbedTLS; + VALID_ARCHS = x86_64; }; name = Release; };