Xcode project updates

Update the Xcode projects to use the new command line Ice Build for Xcode.

4 files changed, 306 insertions, 26 deletions

diff --git a/cpp/test/ios/C++ Test Suite.xcodeproj/project.pbxproj b/cpp/test/ios/C++ Test Suite.xcodeproj/project.pbxproj
index f254b1f0bef..ec36cf2053a 100755
--- a/cpp/test/ios/C++ Test Suite.xcodeproj/project.pbxproj
+++ b/cpp/test/ios/C++ Test Suite.xcodeproj/project.pbxproj
@@ -74,6 +74,45 @@
 		D8842EDC1BFF885600A8B607 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D8842EDB1BFF885600A8B607 /* Default-568h@2x.png */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXBuildRule section */
+		D8BD7A061D89F009001035C7 /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.ice";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp",
+			);
+			script = "/usr/local/bin/icebuilder --cpp";
+		};
+		D8D23B1F1D8AF57D00EE192D /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.ice";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp",
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
+			);
+			script = "/usr/local/bin/icebuilder --cpp";
+		};
+		D8D23B201D8AF59E00EE192D /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.ice";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp",
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
+			);
+			script = "/usr/local/bin/icebuilder --cpp";
+		};
+/* End PBXBuildRule section */
+
 /* Begin PBXFileReference section */
 		14103B2B1CFC5E0E0097DE5A /* C++11 Test Suite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "C++11 Test Suite.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		14103B2C1CFC5E0E0097DE5A /* C++11 Test Suite.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "C++11 Test Suite.plist"; path = "/Users/benoit/Devel/GitHub/ice/cpp/test/ios/C++11 Test Suite.plist"; sourceTree = "<absolute>"; };
@@ -251,6 +290,7 @@
 				14103B271CFC5E0E0097DE5A /* Run Script */,
 			);
 			buildRules = (
+				D8D23B201D8AF59E00EE192D /* PBXBuildRule */,
 			);
 			dependencies = (
 			);
@@ -269,6 +309,7 @@
 				142B839C1B6BA7A600E28347 /* Run Script */,
 			);
 			buildRules = (
+				D8D23B1F1D8AF57D00EE192D /* PBXBuildRule */,
 			);
 			dependencies = (
 			);
@@ -287,6 +328,7 @@
 				144B488F1A78F71F00C0E06B /* Run Script */,
 			);
 			buildRules = (
+				D8BD7A061D89F009001035C7 /* PBXBuildRule */,
 			);
 			dependencies = (
 			);
@@ -474,11 +516,11 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "C++ Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
@@ -493,7 +535,14 @@
 					"-DICE_CPP11_MAPPING",
 					"$(OTHER_CFLAGS)",
 				);
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lIce++11",
+					"-lIceGrid++11",
+					"-lIceStorm++11",
+					"-lGlacier2++11",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.IceTouch-Cpp-Test-Suite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -513,9 +562,9 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "C++ Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
@@ -530,7 +579,14 @@
 					"-DICE_CPP11_MAPPING",
 					"$(OTHER_CFLAGS)",
 				);
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lIce++11",
+					"-lIceGrid++11",
+					"-lIceStorm++11",
+					"-lGlacier2++11",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.IceTouch-Cpp-Test-Suite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -555,7 +611,6 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "C++ Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
@@ -566,7 +621,14 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/C++98 Test Suite-Info.plist";
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lIce",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lGlacier2",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.IceTouch-Cpp-Test-Suite";
 				PRODUCT_NAME = "C++ Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -588,7 +650,6 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "C++ Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
@@ -599,7 +660,14 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/C++98 Test Suite-Info.plist";
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lIce",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lGlacier2",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.IceTouch-Cpp-Test-Suite";
 				PRODUCT_NAME = "C++ Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -620,11 +688,11 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "C++ Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
@@ -635,7 +703,14 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/C++98 Test Suite-Info.plist";
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lIce",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lGlacier2",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.IceTouch-Cpp-Test-Suite";
 				PRODUCT_NAME = "C++ Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -655,9 +730,9 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "C++ Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
@@ -668,7 +743,14 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/C++98 Test Suite-Info.plist";
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lIce",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lGlacier2",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.IceTouch-Cpp-Test-Suite";
 				PRODUCT_NAME = "C++ Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -683,6 +765,7 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ADDITIONAL_SDKS = "../../../IceSDK/$(PLATFORM_NAME).sdk";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "$(IDENTIFIER)";
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -697,6 +780,7 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ADDITIONAL_SDKS = "../../../IceSDK/$(PLATFORM_NAME).sdk";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
diff --git a/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
index 71cb771b340..5a94148ba69 100644
--- a/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,6 +1,16 @@
 {
   "images" : [
     {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
       "size" : "29x29",
       "idiom" : "iphone",
       "filename" : "test_suite-Small@2x-1.png",
@@ -37,6 +47,16 @@
       "scale" : "3x"
     },
     {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
       "size" : "29x29",
       "idiom" : "ipad",
       "filename" : "test_suite-Small.png",
diff --git a/objective-c/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/objective-c/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
index 93f4f1ff22c..5a94148ba69 100644
--- a/objective-c/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/objective-c/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,6 +1,16 @@
 {
   "images" : [
     {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
       "size" : "29x29",
       "idiom" : "iphone",
       "filename" : "test_suite-Small@2x-1.png",
@@ -37,6 +47,16 @@
       "scale" : "3x"
     },
     {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
       "size" : "29x29",
       "idiom" : "ipad",
       "filename" : "test_suite-Small.png",
@@ -71,6 +91,11 @@
       "idiom" : "ipad",
       "filename" : "test_suite-76@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/objective-c/test/ios/Objective-C Test Suite.xcodeproj/project.pbxproj b/objective-c/test/ios/Objective-C Test Suite.xcodeproj/project.pbxproj
index 70826cd5ace..38314830594 100755
--- a/objective-c/test/ios/Objective-C Test Suite.xcodeproj/project.pbxproj
+++ b/objective-c/test/ios/Objective-C Test Suite.xcodeproj/project.pbxproj
@@ -313,6 +313,33 @@
 		D83717A01BFFC5BE005D65BC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82D53AA61823264600703264 /* Images.xcassets */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXBuildRule section */
+		D81F86FA1D89D3B50076917C /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.ice";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m",
+			);
+			script = /usr/local/bin/icebuilder;
+		};
+		D8D23B1E1D8AF52E00EE192D /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.ice";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m",
+			);
+			script = /usr/local/bin/icebuilder;
+		};
+/* End PBXBuildRule section */
+
 /* Begin PBXFileReference section */
 		140064131234DFE800249AA4 /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Server.m; path = ../Ice/invoke/Server.m; sourceTree = SOURCE_ROOT; };
 		140064141234DFE800249AA4 /* InvokeTest.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.slice; name = InvokeTest.ice; path = ../Ice/invoke/InvokeTest.ice; sourceTree = SOURCE_ROOT; };
@@ -373,7 +400,6 @@
 		28D7ACF60DDB3853001CB0EB /* TestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestViewController.h; sourceTree = "<group>"; };
 		28D7ACF70DDB3853001CB0EB /* TestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestViewController.m; sourceTree = "<group>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		32CA4F630368D1EE00C91783 /* Objective-C Test Suite_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Objective-C Test Suite_Prefix.pch"; sourceTree = "<group>"; };
 		342EBA860E926E98000051FA /* server.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; name = server.p12; path = ../../../certs/server.p12; sourceTree = SOURCE_ROOT; };
 		342EBA880E926E9F000051FA /* client.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; name = client.p12; path = ../../../certs/client.p12; sourceTree = SOURCE_ROOT; };
 		342EBA8A0E926F90000051FA /* cacert.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = cacert.der; path = ../../../certs/cacert.der; sourceTree = SOURCE_ROOT; };
@@ -667,7 +693,6 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				32CA4F630368D1EE00C91783 /* Objective-C Test Suite_Prefix.pch */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
 			);
 			name = "Other Sources";
@@ -1019,6 +1044,7 @@
 				14532DC11761D39700176FE1 /* Frameworks */,
 			);
 			buildRules = (
+				D8D23B1E1D8AF52E00EE192D /* PBXBuildRule */,
 			);
 			dependencies = (
 			);
@@ -1036,6 +1062,7 @@
 				1D60588F0D05DD3D006BFB54 /* Frameworks */,
 			);
 			buildRules = (
+				D81F86FA1D89D3B50076917C /* PBXBuildRule */,
 			);
 			dependencies = (
 			);
@@ -1410,6 +1437,7 @@
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1426,7 +1454,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite-ARC";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1445,6 +1488,7 @@
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1461,7 +1505,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite-ARC";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1479,6 +1538,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Objective-C Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -1493,7 +1553,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite-ARC";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1511,6 +1586,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Objective-C Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -1525,7 +1601,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite-ARC";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1560,10 +1651,10 @@
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Objective-C Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = ICE_OBJC_NOGC;
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (
@@ -1576,7 +1667,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				PROVISIONING_PROFILE = "";
@@ -1609,8 +1715,8 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Objective-C Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = ICE_OBJC_NOGC;
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (
@@ -1623,7 +1729,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				PROVISIONING_PROFILE = "";
@@ -1644,10 +1765,10 @@
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Objective-C Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = ICE_OBJC_NOGC;
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (
@@ -1660,7 +1781,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				PROVISIONING_PROFILE = "";
@@ -1680,8 +1816,8 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Objective-C Test Suite_Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = ICE_OBJC_NOGC;
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (
@@ -1694,7 +1830,22 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lIce",
+					"-lIceSSL",
+					"-lGlacier2",
+					"-lIceGrid",
+					"-lIceStorm",
+					"-lIceObjc",
+					"-lIceSSLObjc",
+					"-lGlacier2Objc",
+					"-lIceGridObjc",
+					"-lIceStormObjc",
+					"-lc++",
+					"-lbz2",
+					"-liconv",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Touch-Objective-C-Test-Suite";
 				PRODUCT_NAME = "Objective-C Test Suite";
 				PROVISIONING_PROFILE = "";