# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1248859711 -7200
# Node ID da073b397539c355d4180087f4ebf627c53a8cc5
# Parent  1a5334dfb21def0f5807da4bc2df23c57b1745e3
Adjust for OSX10.5 and Xcode3.1.3 building 32/64 bit universal releases.

diff -r 1a5334dfb21d -r da073b397539 tunblick/Sparkle.xcodeproj/default.pbxuser
--- a/tunblick/Sparkle.xcodeproj/default.pbxuser	Wed Jul 29 11:23:17 2009 +0200
+++ b/tunblick/Sparkle.xcodeproj/default.pbxuser	Wed Jul 29 11:28:31 2009 +0200
@@ -1,23 +1,70 @@
 // !$*UTF8*$!
 {
 	0867D690FE84028FC02AAC07 /* Project object */ = {
-		activeArchitecture = i386;
-		activeBuildConfigurationName = Debug;
+		activeBuildConfigurationName = Release;
 		activeExecutable = FAEC981A0D94C8750008EDA9 /* Sparkle Test App */;
-		activeTarget = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */;
+		activeTarget = 8DC2EF4F0486A6940098B216 /* Sparkle */;
 		codeSenseManager = FAEC98240D94C8760008EDA9 /* Code sense */;
 		executables = (
 			FAEC981A0D94C8750008EDA9 /* Sparkle Test App */,
 			FAEC981B0D94C8750008EDA9 /* Relaunch Tool */,
+			A86A4DB0101DFA8A002BFDFC /* relaunch tool */,
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 227854453;
-			PBXWorkspaceStateSaveDate = 227854453;
+			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					364,
+					20,
+					48,
+					43,
+					43,
+					20,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+					PBXFileDataSource_Target_ColumnID,
+				);
+			};
+			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					324,
+					60,
+					20,
+					48,
+					43,
+					43,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXTargetDataSource_PrimaryAttribute,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+				);
+			};
+			PBXPerProjectTemplateStateSaveDate = 270492760;
+			PBXWorkspaceStateSaveDate = 270492760;
 		};
 		sourceControlManager = FAEC98230D94C8760008EDA9 /* Source Control */;
 		userBuildSettings = {
 		};
 	};
+	612279D80DB5470200AB99EA /* Sparkle Unit Tests */ = {
+		activeExec = 0;
+	};
 	61B5F90109C4CEE200B25A18 /* Sparkle Test App */ = {
 		activeExec = 0;
 		executables = (
@@ -27,10 +74,33 @@
 	8DC2EF4F0486A6940098B216 /* Sparkle */ = {
 		activeExec = 0;
 	};
-	D1E42C2E0CE754AE00F50EB9 /* Relaunch Tool */ = {
+	A86A4DB0101DFA8A002BFDFC /* relaunch tool */ = {
+		isa = PBXExecutable;
+		activeArgIndices = (
+		);
+		argumentStrings = (
+		);
+		autoAttachOnCrash = 1;
+		breakpointsEnabled = 1;
+		configStateDict = {
+		};
+		customDataFormattersEnabled = 1;
+		debuggerPlugin = GDBDebugging;
+		disassemblyDisplayState = 0;
+		enableDebugStr = 1;
+		environmentEntries = (
+		);
+		executableSystemSymbolLevel = 0;
+		executableUserSymbolLevel = 0;
+		libgmallocEnabled = 0;
+		name = "relaunch tool";
+		sourceDirectories = (
+		);
+	};
+	DAAEFC950DA571DF0051E0D0 /* relaunch tool */ = {
 		activeExec = 0;
 		executables = (
-			FAEC981B0D94C8750008EDA9 /* Relaunch Tool */,
+			A86A4DB0101DFA8A002BFDFC /* relaunch tool */,
 		);
 	};
 	FAEC981A0D94C8750008EDA9 /* Sparkle Test App */ = {
diff -r 1a5334dfb21d -r da073b397539 tunblick/Sparkle.xcodeproj/project.pbxproj
--- a/tunblick/Sparkle.xcodeproj/project.pbxproj	Wed Jul 29 11:23:17 2009 +0200
+++ b/tunblick/Sparkle.xcodeproj/project.pbxproj	Wed Jul 29 11:28:31 2009 +0200
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 45;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -675,7 +675,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */;
-			compatibilityVersion = "Xcode 3.0";
+			compatibilityVersion = "Xcode 3.1";
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -976,6 +976,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH)";
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
@@ -983,13 +985,16 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_DEBUGGING_SYMBOLS = full;
+				SDKROOT = macosx10.5;
 			};
 			name = Release;
 		};
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH)";
 				WARNING_CFLAGS = "-Wundeclared-selector";
 			};
 			name = Debug;
@@ -997,6 +1002,8 @@
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				SDKROOT = macosx10.5;
 				WARNING_CFLAGS = "-Wundeclared-selector";
 			};
 			name = Release;
@@ -1004,7 +1011,8 @@
 		61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5-only) */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = "";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				SDKROOT = macosx10.5;
 				WARNING_CFLAGS = "-Wundeclared-selector";
 			};
 			name = "Release (GC dual-mode; 10.5-only)";
@@ -1013,7 +1021,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				INSTALL_PATH = "@loader_path/../Frameworks";
+				SDKROOT = macosx10.5;
 			};
 			name = "Release (GC dual-mode; 10.5-only)";
 		};
@@ -1021,6 +1031,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				SDKROOT = macosx10.5;
 			};
 			name = "Release (GC dual-mode; 10.5-only)";
 		};
@@ -1028,6 +1040,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				SDKROOT = macosx10.5;
 			};
 			name = "Release (GC dual-mode; 10.5-only)";
 		};
@@ -1035,7 +1049,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
@@ -1063,7 +1077,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1083,6 +1097,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "Sparkle Unit Tests";
+				SDKROOT = "";
 				WRAPPER_EXTENSION = octest;
 				ZERO_LINK = NO;
 			};
@@ -1092,7 +1107,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
@@ -1120,6 +1135,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH)";
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
@@ -1127,6 +1144,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				SDKROOT = macosx10.5;
 			};
 			name = Release;
 		};
@@ -1134,6 +1153,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941D30D94A70100DD942E /* ConfigRelaunchDebug.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH)";
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
@@ -1141,6 +1162,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				SDKROOT = macosx10.5;
 			};
 			name = Release;
 		};
diff -r 1a5334dfb21d -r da073b397539 tunblick/Tunnelblick.xcodeproj/project.pbxproj
--- a/tunblick/Tunnelblick.xcodeproj/project.pbxproj	Wed Jul 29 11:23:17 2009 +0200
+++ b/tunblick/Tunnelblick.xcodeproj/project.pbxproj	Wed Jul 29 11:28:31 2009 +0200
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 45;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -422,7 +422,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Tunnelblick" */;
-			compatibilityVersion = "Xcode 3.0";
+			compatibilityVersion = "Xcode 3.1";
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -672,21 +672,17 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
+				SDKROOT = macosx10.5;
 			};
 			name = Release;
 		};