From 0d2c4e99b5b61b0af88eae86e23ab6a760a80696 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Fri, 6 Mar 2020 09:48:35 +0300 Subject: [PATCH] Delete redundant config files --- Configuration/Compilation.xcconfig | 2 -- Configuration/OpenVPNAdapter.xcconfig | 2 -- Configuration/OpenVPNClient.xcconfig | 2 -- Configuration/Project.xcconfig | 3 +++ OpenVPNAdapter.xcodeproj/project.pbxproj | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) delete mode 100755 Configuration/Compilation.xcconfig diff --git a/Configuration/Compilation.xcconfig b/Configuration/Compilation.xcconfig deleted file mode 100755 index 3e4c6ec..0000000 --- a/Configuration/Compilation.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -CLANG_CXX_LANGUAGE_STANDARD = gnu++14 -CLANG_CXX_LIBRARY = libc++ diff --git a/Configuration/OpenVPNAdapter.xcconfig b/Configuration/OpenVPNAdapter.xcconfig index 5db6035..6c5b0dc 100644 --- a/Configuration/OpenVPNAdapter.xcconfig +++ b/Configuration/OpenVPNAdapter.xcconfig @@ -1,4 +1,2 @@ -#include "Compilation.xcconfig" - GCC_PREPROCESSOR_DEFINITIONS = $(inherited) USE_ASIO GCC_WARN_64_TO_32_BIT_CONVERSION = NO diff --git a/Configuration/OpenVPNClient.xcconfig b/Configuration/OpenVPNClient.xcconfig index 3db2934..ad70cb9 100644 --- a/Configuration/OpenVPNClient.xcconfig +++ b/Configuration/OpenVPNClient.xcconfig @@ -1,4 +1,2 @@ -#include "Compilation.xcconfig" - GCC_PREPROCESSOR_DEFINITIONS = $(inherited) USE_ASIO USE_ASIO_THREADLOCAL ASIO_STANDALONE ASIO_NO_DEPRECATED ASIO_HAS_STD_STRING_VIEW USE_MBEDTLS HAVE_LZ4 OPENVPN_FORCE_TUN_NULL USE_TUN_BUILDER GCC_WARN_64_TO_32_BIT_CONVERSION = NO diff --git a/Configuration/Project.xcconfig b/Configuration/Project.xcconfig index 23223d1..6a335e8 100755 --- a/Configuration/Project.xcconfig +++ b/Configuration/Project.xcconfig @@ -3,6 +3,9 @@ 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 diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index b26cb96..1e3e847 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -177,7 +177,6 @@ C9EABF3024110BE200D828D4 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; C9EABF3224110E7500D828D4 /* ovpnapi.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ovpnapi.hpp; sourceTree = ""; }; C9EABF3324110E7500D828D4 /* ovpncli.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ovpncli.hpp; sourceTree = ""; }; - C9EABF442411133400D828D4 /* Compilation.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Compilation.xcconfig; sourceTree = ""; }; C9EABF492411133400D828D4 /* Project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; C9EABF642411189800D828D4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; C9EABF7324111AEE00D828D4 /* OpenVPNClient.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OpenVPNClient.xcconfig; sourceTree = ""; }; @@ -436,7 +435,6 @@ isa = PBXGroup; children = ( C9EABF492411133400D828D4 /* Project.xcconfig */, - C9EABF442411133400D828D4 /* Compilation.xcconfig */, C9EABF7524111E9C00D828D4 /* LZ4.xcconfig */, C9EABF7624111F1600D828D4 /* mbedTLS.xcconfig */, C9EABF7324111AEE00D828D4 /* OpenVPNClient.xcconfig */,