From ca7347558e658758bb39a31b2540062af787a6db Mon Sep 17 00:00:00 2001 From: Macbook Date: Tue, 29 Oct 2024 20:20:30 +0700 Subject: [PATCH] add Project-MacNE.xcconfig --- Configuration/Project-MacNE.xcconfig | 35 +++++++++++++++++++++++ Configuration/amnezia.xcconfig | 36 +++++++++++++++++++++++- OpenVPNAdapter.xcodeproj/project.pbxproj | 20 +++++++------ 3 files changed, 82 insertions(+), 9 deletions(-) create mode 100755 Configuration/Project-MacNE.xcconfig diff --git a/Configuration/Project-MacNE.xcconfig b/Configuration/Project-MacNE.xcconfig new file mode 100755 index 0000000..5e35e5c --- /dev/null +++ b/Configuration/Project-MacNE.xcconfig @@ -0,0 +1,35 @@ +SUPPORTED_PLATFORMS = macosx +//TARGETED_DEVICE_FAMILY = 1,2 + +HEADER_SEARCH_PATHS = $(inherited) \ + $(SRCROOT)/Sources/OpenVPNAdapter/include \ + $(SRCROOT)/Sources/OpenVPNClient/include \ + $(SRCROOT)/Sources/LZ4/include \ + $(SRCROOT)/Sources/mbedTLS/include \ + $(SRCROOT)/Sources/ASIO/asio/include \ + $(SRCROOT)/Sources/OpenVPN3 + +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 + +SDKROOT[arch=x86_64] = macosx +//SDKROOT[arch=arm64] = macosx + +VALID_ARCHS[sdk=macosx*] = x86_64 +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 d6736a8..c1fab96 100644 --- a/Configuration/amnezia.xcconfig +++ b/Configuration/amnezia.xcconfig @@ -1,3 +1,37 @@ -PROJECT_TEMP_DIR = /Users/macbook/Documents/VPN/dev-branch/amnezia-client/client/3rd/OpenVPNAdapter/build/OpenVPNAdapter.build +SUPPORTED_PLATFORMS = macosx +//TARGETED_DEVICE_FAMILY = 1,2 + +HEADER_SEARCH_PATHS = $(inherited) \ + $(SRCROOT)/Sources/OpenVPNAdapter/include \ + $(SRCROOT)/Sources/OpenVPNClient/include \ + $(SRCROOT)/Sources/LZ4/include \ + $(SRCROOT)/Sources/mbedTLS/include \ + $(SRCROOT)/Sources/ASIO/asio/include \ + $(SRCROOT)/Sources/OpenVPN3 + +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 + +SDKROOT[arch=x86_64] = macosx +//SDKROOT[arch=arm64] = macosx + +VALID_ARCHS[sdk=macosx*] = x86_64 +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 diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index 5b80853..f41701e 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -1500,7 +1500,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = LZ4; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; }; name = Debug; }; @@ -1531,7 +1531,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = LZ4; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; }; name = Release; }; @@ -1540,6 +1540,8 @@ baseConfigurationReference = C9EABF7424111D6100D828D4 /* OpenVPNAdapter.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + ARCHS = "$(ARCHS_STANDARD)"; + ARCHSa = "$(ARCHS_STANDARD)"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "$(CODE_SIGN_IDENTITY_$(_DEVELOPMENT_TEAM_IS_EMPTY))"; CODE_SIGN_STYLE = Automatic; @@ -1575,7 +1577,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNAdapter; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; "VALID_ARCHS[arch=*]" = x86_64; "VALID_ARCHS[sdk=iphoneos*]" = x86_64; }; @@ -1586,6 +1588,8 @@ baseConfigurationReference = C9EABF7424111D6100D828D4 /* OpenVPNAdapter.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + ARCHS = "$(ARCHS_STANDARD)"; + ARCHSa = "$(ARCHS_STANDARD)"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "$(CODE_SIGN_IDENTITY_$(_DEVELOPMENT_TEAM_IS_EMPTY))"; CODE_SIGN_STYLE = Automatic; @@ -1621,7 +1625,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNAdapter; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; "VALID_ARCHS[arch=*]" = x86_64; "VALID_ARCHS[sdk=iphoneos*]" = arm64; }; @@ -1690,7 +1694,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNClient; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; a = ""; }; name = Debug; @@ -1733,7 +1737,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNClient; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; "VALID_ARCHS[sdk=iphoneos*]" = x86_64; a = ""; }; @@ -1769,7 +1773,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = mbedTLS; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; }; name = Debug; }; @@ -1803,7 +1807,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = mbedTLS; - VALID_ARCHS = x86_64; + VALID_ARCHS = "arm64 x86_64"; }; name = Release; };