From eaa24dba1c3e1ef57a3f868a6f37903badad7063 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 25 Oct 2016 15:06:45 +0300 Subject: [PATCH] [ios] Updated xcode project for building oauth library. --- .../oauthcpp.xcodeproj/project.pbxproj | 85 ++----------------- 1 file changed, 8 insertions(+), 77 deletions(-) diff --git a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj index 29b289f76b..84ae7d79f8 100644 --- a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj +++ b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj @@ -21,7 +21,6 @@ /* Begin PBXFileReference section */ 340C20EF1C3E5E5000111D22 /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 340C20F61C3E5E6600111D22 /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 340C20F81C3E5EED00111D22 /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = src/base64.cpp; sourceTree = ""; }; 340C20F91C3E5EED00111D22 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = src/base64.h; sourceTree = ""; }; 340C20FA1C3E5EED00111D22 /* HMAC_SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HMAC_SHA1.cpp; path = src/HMAC_SHA1.cpp; sourceTree = ""; }; @@ -32,6 +31,8 @@ 340C20FF1C3E5EED00111D22 /* urlencode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = urlencode.cpp; path = src/urlencode.cpp; sourceTree = ""; }; 340C21001C3E5EED00111D22 /* urlencode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = urlencode.h; path = src/urlencode.h; sourceTree = ""; }; 340C210A1C3E5EF600111D22 /* liboauthcpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = liboauthcpp.h; path = include/liboauthcpp/liboauthcpp.h; sourceTree = ""; }; + 34F558701DBF4AB300A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 34F558711DBF4AB300A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -48,7 +49,8 @@ 340C20E61C3E5E5000111D22 = { isa = PBXGroup; children = ( - 340C20F61C3E5E6600111D22 /* defaults.xcconfig */, + 34F558701DBF4AB300A4FC11 /* common-debug.xcconfig */, + 34F558711DBF4AB300A4FC11 /* common-release.xcconfig */, 340C20F71C3E5EA200111D22 /* liboauthcpp */, 340C20F01C3E5E5000111D22 /* Products */, ); @@ -164,94 +166,23 @@ /* Begin XCBuildConfiguration section */ 340C20F11C3E5E5000111D22 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 340C20F61C3E5E6600111D22 /* defaults.xcconfig */; + baseConfigurationReference = 34F558701DBF4AB300A4FC11 /* common-debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", + "$(inherited)", "$(OMIM_ROOT)/3party/liboauthcpp/include", ); - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Debug; }; 340C20F21C3E5E5000111D22 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 340C20F61C3E5E6600111D22 /* defaults.xcconfig */; + baseConfigurationReference = 34F558711DBF4AB300A4FC11 /* common-release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", + "$(inherited)", "$(OMIM_ROOT)/3party/liboauthcpp/include", ); - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Release; };