From 9fc51bdef4b208b9181de42ae97ca8cb4f5fee8c Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 25 Oct 2016 15:04:36 +0300 Subject: [PATCH] [ios] Updated xcode project for building tomcrypt library. --- .../tomcrypt.xcodeproj/project.pbxproj | 89 ++----------------- 1 file changed, 6 insertions(+), 83 deletions(-) diff --git a/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj b/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj index 44ad8c80d1..83e1055183 100644 --- a/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj +++ b/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj @@ -14,8 +14,9 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 34F558741DBF4B9F00A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 34F558751DBF4B9F00A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 39B24A011BAB222E00681326 /* crypt_argchk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crypt_argchk.c; path = src/misc/crypt/crypt_argchk.c; sourceTree = ""; }; - 670D05B11B0E0A160013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 675344EA1A3F693B00A0A8C3 /* libtomcrypt.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtomcrypt.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675345281A3F6AF000A0A8C3 /* sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sha256.c; path = src/hashes/sha2/sha256.c; sourceTree = ""; }; 6753452A1A3F6B0100A0A8C3 /* base64_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64_decode.c; path = src/misc/base64/base64_decode.c; sourceTree = ""; }; @@ -36,7 +37,8 @@ 675344E11A3F693B00A0A8C3 = { isa = PBXGroup; children = ( - 670D05B11B0E0A160013A7AC /* defaults.xcconfig */, + 34F558741DBF4B9F00A4FC11 /* common-debug.xcconfig */, + 34F558751DBF4B9F00A4FC11 /* common-release.xcconfig */, 675344EC1A3F693B00A0A8C3 /* tomcrypt */, 675344EB1A3F693B00A0A8C3 /* Products */, ); @@ -140,102 +142,30 @@ /* Begin XCBuildConfiguration section */ 675344F31A3F693B00A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 670D05B11B0E0A160013A7AC /* defaults.xcconfig */; + baseConfigurationReference = 34F558741DBF4B9F00A4FC11 /* 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; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/tomcrypt/src/headers", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; 675344F41A3F693B00A0A8C3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 670D05B11B0E0A160013A7AC /* defaults.xcconfig */; + baseConfigurationReference = 34F558751DBF4B9F00A4FC11 /* 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; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/tomcrypt/src/headers", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; 675344F61A3F693B00A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - GCC_CW_ASM_SYNTAX = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -243,14 +173,7 @@ 675344F71A3F693B00A0A8C3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - GCC_CW_ASM_SYNTAX = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release;