From 6c980fb68c37b5d944b35257b60ccc3addba9687 Mon Sep 17 00:00:00 2001 From: Viktor Krikun Date: Sun, 11 Sep 2011 18:59:34 +0000 Subject: [PATCH] Update Xcode projects to the latest version of Xcode 4 --- .../xcode/libzrtp.xcodeproj/project.pbxproj | 19 +++++++++---------- .../libzrtp_test.xcodeproj/project.pbxproj | 10 +++++++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/projects/xcode/libzrtp.xcodeproj/project.pbxproj b/projects/xcode/libzrtp.xcodeproj/project.pbxproj index 846e895367..5eec2ac3f5 100644 --- a/projects/xcode/libzrtp.xcodeproj/project.pbxproj +++ b/projects/xcode/libzrtp.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -412,8 +412,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + }; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "libzrtp" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -506,8 +509,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64 ppc"; }; name = Debug; @@ -519,8 +521,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64 ppc"; }; name = Release; @@ -532,7 +533,6 @@ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( @@ -544,7 +544,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; PRODUCT_NAME = zrtp; - SDKROOT = macosx10.6; + SDKROOT = macosx; SYMROOT = build; VALID_ARCHS = "i386 ppc x86_64"; }; @@ -565,7 +565,7 @@ INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = "-DZRTP_USE_ENTERPRISE=1"; PRODUCT_NAME = zrtp; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 ppc x86_64"; }; name = Release; @@ -585,7 +585,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = configure; ZERO_LINK = NO; }; diff --git a/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj b/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj index 2d957237fa..dc080d86a8 100644 --- a/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj +++ b/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 8D6EED000F01458D00529121 /* zrtp_test_crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 8D6EECF80F01458D00529121 /* zrtp_test_crypto.c */; }; 8D6EED010F01458D00529121 /* zrtp_test_queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 8D6EECF90F01458D00529121 /* zrtp_test_queue.c */; }; 8D6EED020F01458D00529121 /* zrtp_test_ui.c in Sources */ = {isa = PBXBuildFile; fileRef = 8D6EECFA0F01458D00529121 /* zrtp_test_ui.c */; }; - 8D6EED110F0145BF00529121 /* libzrtp_ec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D6EED0F0F0145AA00529121 /* libzrtp_ec.a */; }; + 8D6EED110F0145BF00529121 /* libzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D6EED0F0F0145AA00529121 /* libzrtp.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -47,7 +47,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8D6EED110F0145BF00529121 /* libzrtp_ec.a in Frameworks */, + 8D6EED110F0145BF00529121 /* libzrtp.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -136,7 +136,11 @@ isa = PBXProject; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "libzrtp_test" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + en, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* libzrtp_test */; projectDirPath = ""; projectReferences = ( @@ -156,7 +160,7 @@ 8D6EED0F0F0145AA00529121 /* libzrtp_ec.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libzrtp_ec.a; + path = libzrtp.a; remoteRef = 8D6EED0E0F0145AA00529121 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; };