From 589039481a6be14310d97d4b4542c0683dec70ff Mon Sep 17 00:00:00 2001
From: Viktor Krikun <v.krikun@zfoneproject.com>
Date: Tue, 20 Sep 2011 20:40:02 +0000
Subject: [PATCH] Minor improvements in OSX build system

---
 .../contents.xcworkspacedata                  |  7 +++++++
 .../libzrtp_test.xcodeproj/project.pbxproj    | 21 ++++++++-----------
 .../contents.xcworkspacedata                  |  7 +++++++
 3 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 projects/xcode/libzrtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 projects/xcode/libzrtp_test.xcodeproj/project.xcworkspace/contents.xcworkspacedata

diff --git a/projects/xcode/libzrtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/xcode/libzrtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..d933b88e96
--- /dev/null
+++ b/projects/xcode/libzrtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:libzrtp.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj b/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj
index dc080d86a8..c70f0fc50e 100644
--- a/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj
+++ b/projects/xcode/libzrtp_test.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -84,7 +84,7 @@
 		8D6EED040F0145AA00529121 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8D6EED0F0F0145AA00529121 /* libzrtp_ec.a */,
+				8D6EED0F0F0145AA00529121 /* libzrtp.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -134,8 +134,11 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0410;
+			};
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "libzrtp_test" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -157,7 +160,7 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		8D6EED0F0F0145AA00529121 /* libzrtp_ec.a */ = {
+		8D6EED0F0F0145AA00529121 /* libzrtp.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libzrtp.a;
@@ -198,8 +201,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -210,8 +212,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -221,7 +222,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				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 = (
@@ -237,7 +237,6 @@
 					"\"$(SRCROOT)/../../../third_party/bnlib\"",
 				);
 				OTHER_CFLAGS = "";
-				PREBINDING = NO;
 				PRODUCT_NAME = libzrtp_test_ec;
 				SYMROOT = build_test;
 			};
@@ -249,7 +248,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				HEADER_SEARCH_PATHS = (
 					../../third_party/bnlib,
@@ -264,7 +262,6 @@
 					"\"$(SRCROOT)/../../../third_party/bnlib\"",
 				);
 				OTHER_CFLAGS = "-DZRTP_USE_ENTERPRISE=1";
-				PREBINDING = NO;
 				PRODUCT_NAME = libzrtp_test_ec;
 				SYMROOT = build_test;
 				ZERO_LINK = NO;
diff --git a/projects/xcode/libzrtp_test.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/xcode/libzrtp_test.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..3d74d82b5b
--- /dev/null
+++ b/projects/xcode/libzrtp_test.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:libzrtp_test.xcodeproj">
+   </FileRef>
+</Workspace>