Add build/all.xcodeproj, which builds all known targets.

Removes currently-broken targets from webkit.xcodeproj (port, glue).
Adds an All target to project files with multiple targets (googleurl.xcodeproj).
Brings our xcconfigs to lzma_sdk.xcodeproj (formerly 7z_C.xcodeproj).
Review URL: http://codereview.chromium.org/2001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1873 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 80 insertions, 115 deletions

diff --git a/third_party/lzma_sdk/7z_C.xcodeproj/project.pbxproj b/third_party/lzma_sdk/lzma_sdk.xcodeproj/project.pbxproj
index 81cb09a..f57395f 100644
--- a/third_party/lzma_sdk/7z_C.xcodeproj/project.pbxproj
+++ b/third_party/lzma_sdk/lzma_sdk.xcodeproj/project.pbxproj
@@ -3,68 +3,58 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 45;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		82F0BAB20D80B7470051C8A3 /* LzmaTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAAF0D80B7470051C8A3 /* LzmaTypes.h */; };
-		82F0BAB30D80B7470051C8A3 /* LzmaDecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAB00D80B7470051C8A3 /* LzmaDecode.h */; };
 		82F0BAB40D80B7470051C8A3 /* LzmaDecode.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAB10D80B7470051C8A3 /* LzmaDecode.c */; };
 		82F0BAB90D80B75B0051C8A3 /* 7zCrc.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAB60D80B75B0051C8A3 /* 7zCrc.c */; };
-		82F0BABA0D80B75B0051C8A3 /* 7zCrc.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAB70D80B75B0051C8A3 /* 7zCrc.h */; };
-		82F0BABB0D80B75B0051C8A3 /* Types.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAB80D80B75B0051C8A3 /* Types.h */; };
-		82F0BAC20D80B7760051C8A3 /* BranchX86.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BABD0D80B7760051C8A3 /* BranchX86.h */; };
 		82F0BAC30D80B7760051C8A3 /* BranchX86.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BABE0D80B7760051C8A3 /* BranchX86.c */; };
-		82F0BAC40D80B7760051C8A3 /* BranchX86_2.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BABF0D80B7760051C8A3 /* BranchX86_2.h */; };
 		82F0BAC50D80B7760051C8A3 /* BranchX86_2.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAC00D80B7760051C8A3 /* BranchX86_2.c */; };
-		82F0BAC60D80B7760051C8A3 /* BranchTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAC10D80B7760051C8A3 /* BranchTypes.h */; };
 		82F0BAD80D80B7980051C8A3 /* 7zAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAC80D80B7980051C8A3 /* 7zAlloc.c */; };
-		82F0BAD90D80B7980051C8A3 /* 7zAlloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAC90D80B7980051C8A3 /* 7zAlloc.h */; };
 		82F0BADA0D80B7980051C8A3 /* 7zBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BACA0D80B7980051C8A3 /* 7zBuffer.c */; };
-		82F0BADB0D80B7980051C8A3 /* 7zBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BACB0D80B7980051C8A3 /* 7zBuffer.h */; };
 		82F0BADC0D80B7980051C8A3 /* 7zDecode.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BACC0D80B7980051C8A3 /* 7zDecode.c */; };
-		82F0BADD0D80B7980051C8A3 /* 7zDecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BACD0D80B7980051C8A3 /* 7zDecode.h */; };
 		82F0BADE0D80B7980051C8A3 /* 7zExtract.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BACE0D80B7980051C8A3 /* 7zExtract.c */; };
-		82F0BADF0D80B7980051C8A3 /* 7zExtract.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BACF0D80B7980051C8A3 /* 7zExtract.h */; };
 		82F0BAE00D80B7980051C8A3 /* 7zHeader.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAD00D80B7980051C8A3 /* 7zHeader.c */; };
-		82F0BAE10D80B7980051C8A3 /* 7zHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAD10D80B7980051C8A3 /* 7zHeader.h */; };
 		82F0BAE20D80B7980051C8A3 /* 7zIn.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAD20D80B7980051C8A3 /* 7zIn.c */; };
-		82F0BAE30D80B7980051C8A3 /* 7zIn.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAD30D80B7980051C8A3 /* 7zIn.h */; };
 		82F0BAE40D80B7980051C8A3 /* 7zItem.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAD40D80B7980051C8A3 /* 7zItem.c */; };
-		82F0BAE50D80B7980051C8A3 /* 7zItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAD50D80B7980051C8A3 /* 7zItem.h */; };
 		82F0BAE60D80B7980051C8A3 /* 7zMethodID.c in Sources */ = {isa = PBXBuildFile; fileRef = 82F0BAD60D80B7980051C8A3 /* 7zMethodID.c */; };
-		82F0BAE70D80B7980051C8A3 /* 7zMethodID.h in Headers */ = {isa = PBXBuildFile; fileRef = 82F0BAD70D80B7980051C8A3 /* 7zMethodID.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		82F0BAAF0D80B7470051C8A3 /* LzmaTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzmaTypes.h; path = Compress/Lzma/LzmaTypes.h; sourceTree = "<group>"; };
-		82F0BAB00D80B7470051C8A3 /* LzmaDecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzmaDecode.h; path = Compress/Lzma/LzmaDecode.h; sourceTree = "<group>"; };
-		82F0BAB10D80B7470051C8A3 /* LzmaDecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = LzmaDecode.c; path = Compress/Lzma/LzmaDecode.c; sourceTree = "<group>"; };
+		7B6606330E75D9DD00CE099E /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
+		7B6606340E75D9DD00CE099E /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
+		7B6606350E75D9DD00CE099E /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
+		7B6606360E75D9DD00CE099E /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
+		7B6606370E75D9DD00CE099E /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
+		82F0BAAF0D80B7470051C8A3 /* LzmaTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LzmaTypes.h; sourceTree = "<group>"; };
+		82F0BAB00D80B7470051C8A3 /* LzmaDecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LzmaDecode.h; sourceTree = "<group>"; };
+		82F0BAB10D80B7470051C8A3 /* LzmaDecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LzmaDecode.c; sourceTree = "<group>"; };
 		82F0BAB60D80B75B0051C8A3 /* 7zCrc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zCrc.c; sourceTree = "<group>"; };
 		82F0BAB70D80B75B0051C8A3 /* 7zCrc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zCrc.h; sourceTree = "<group>"; };
 		82F0BAB80D80B75B0051C8A3 /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Types.h; sourceTree = "<group>"; };
-		82F0BABD0D80B7760051C8A3 /* BranchX86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BranchX86.h; path = Compress/Branch/BranchX86.h; sourceTree = "<group>"; };
-		82F0BABE0D80B7760051C8A3 /* BranchX86.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = BranchX86.c; path = Compress/Branch/BranchX86.c; sourceTree = "<group>"; };
-		82F0BABF0D80B7760051C8A3 /* BranchX86_2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BranchX86_2.h; path = Compress/Branch/BranchX86_2.h; sourceTree = "<group>"; };
-		82F0BAC00D80B7760051C8A3 /* BranchX86_2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = BranchX86_2.c; path = Compress/Branch/BranchX86_2.c; sourceTree = "<group>"; };
-		82F0BAC10D80B7760051C8A3 /* BranchTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BranchTypes.h; path = Compress/Branch/BranchTypes.h; sourceTree = "<group>"; };
-		82F0BAC80D80B7980051C8A3 /* 7zAlloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zAlloc.c; path = Archive/7z/7zAlloc.c; sourceTree = "<group>"; };
-		82F0BAC90D80B7980051C8A3 /* 7zAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zAlloc.h; path = Archive/7z/7zAlloc.h; sourceTree = "<group>"; };
-		82F0BACA0D80B7980051C8A3 /* 7zBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zBuffer.c; path = Archive/7z/7zBuffer.c; sourceTree = "<group>"; };
-		82F0BACB0D80B7980051C8A3 /* 7zBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zBuffer.h; path = Archive/7z/7zBuffer.h; sourceTree = "<group>"; };
-		82F0BACC0D80B7980051C8A3 /* 7zDecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zDecode.c; path = Archive/7z/7zDecode.c; sourceTree = "<group>"; };
-		82F0BACD0D80B7980051C8A3 /* 7zDecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zDecode.h; path = Archive/7z/7zDecode.h; sourceTree = "<group>"; };
-		82F0BACE0D80B7980051C8A3 /* 7zExtract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zExtract.c; path = Archive/7z/7zExtract.c; sourceTree = "<group>"; };
-		82F0BACF0D80B7980051C8A3 /* 7zExtract.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zExtract.h; path = Archive/7z/7zExtract.h; sourceTree = "<group>"; };
-		82F0BAD00D80B7980051C8A3 /* 7zHeader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zHeader.c; path = Archive/7z/7zHeader.c; sourceTree = "<group>"; };
-		82F0BAD10D80B7980051C8A3 /* 7zHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zHeader.h; path = Archive/7z/7zHeader.h; sourceTree = "<group>"; };
-		82F0BAD20D80B7980051C8A3 /* 7zIn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zIn.c; path = Archive/7z/7zIn.c; sourceTree = "<group>"; };
-		82F0BAD30D80B7980051C8A3 /* 7zIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zIn.h; path = Archive/7z/7zIn.h; sourceTree = "<group>"; };
-		82F0BAD40D80B7980051C8A3 /* 7zItem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zItem.c; path = Archive/7z/7zItem.c; sourceTree = "<group>"; };
-		82F0BAD50D80B7980051C8A3 /* 7zItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zItem.h; path = Archive/7z/7zItem.h; sourceTree = "<group>"; };
-		82F0BAD60D80B7980051C8A3 /* 7zMethodID.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zMethodID.c; path = Archive/7z/7zMethodID.c; sourceTree = "<group>"; };
-		82F0BAD70D80B7980051C8A3 /* 7zMethodID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 7zMethodID.h; path = Archive/7z/7zMethodID.h; sourceTree = "<group>"; };
-		D2AAC046055464E500DB518D /* lib7z.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = lib7z.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		82F0BABD0D80B7760051C8A3 /* BranchX86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchX86.h; sourceTree = "<group>"; };
+		82F0BABE0D80B7760051C8A3 /* BranchX86.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BranchX86.c; sourceTree = "<group>"; };
+		82F0BABF0D80B7760051C8A3 /* BranchX86_2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchX86_2.h; sourceTree = "<group>"; };
+		82F0BAC00D80B7760051C8A3 /* BranchX86_2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BranchX86_2.c; sourceTree = "<group>"; };
+		82F0BAC10D80B7760051C8A3 /* BranchTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchTypes.h; sourceTree = "<group>"; };
+		82F0BAC80D80B7980051C8A3 /* 7zAlloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zAlloc.c; sourceTree = "<group>"; };
+		82F0BAC90D80B7980051C8A3 /* 7zAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zAlloc.h; sourceTree = "<group>"; };
+		82F0BACA0D80B7980051C8A3 /* 7zBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zBuffer.c; sourceTree = "<group>"; };
+		82F0BACB0D80B7980051C8A3 /* 7zBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zBuffer.h; sourceTree = "<group>"; };
+		82F0BACC0D80B7980051C8A3 /* 7zDecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zDecode.c; sourceTree = "<group>"; };
+		82F0BACD0D80B7980051C8A3 /* 7zDecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zDecode.h; sourceTree = "<group>"; };
+		82F0BACE0D80B7980051C8A3 /* 7zExtract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zExtract.c; sourceTree = "<group>"; };
+		82F0BACF0D80B7980051C8A3 /* 7zExtract.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zExtract.h; sourceTree = "<group>"; };
+		82F0BAD00D80B7980051C8A3 /* 7zHeader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zHeader.c; sourceTree = "<group>"; };
+		82F0BAD10D80B7980051C8A3 /* 7zHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zHeader.h; sourceTree = "<group>"; };
+		82F0BAD20D80B7980051C8A3 /* 7zIn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zIn.c; sourceTree = "<group>"; };
+		82F0BAD30D80B7980051C8A3 /* 7zIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zIn.h; sourceTree = "<group>"; };
+		82F0BAD40D80B7980051C8A3 /* 7zItem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zItem.c; sourceTree = "<group>"; };
+		82F0BAD50D80B7980051C8A3 /* 7zItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zItem.h; sourceTree = "<group>"; };
+		82F0BAD60D80B7980051C8A3 /* 7zMethodID.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 7zMethodID.c; sourceTree = "<group>"; };
+		82F0BAD70D80B7980051C8A3 /* 7zMethodID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 7zMethodID.h; sourceTree = "<group>"; };
+		D2AAC046055464E500DB518D /* liblzma_sdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblzma_sdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -78,20 +68,21 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* 7z_C */ = {
+		08FB7794FE84155DC02AAC07 /* lzma_sdk */ = {
 			isa = PBXGroup;
 			children = (
+				7B6606300E75D9BF00CE099E /* Configuration */,
 				08FB7795FE84155DC02AAC07 /* Source */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
 			);
-			name = 7z_C;
+			name = lzma_sdk;
 			sourceTree = "<group>";
 		};
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
 				82F0BAB50D80B74F0051C8A3 /* Common */,
-				82F0BAAE0D80B7270051C8A3 /* LZMA */,
+				82F0BAAE0D80B7270051C8A3 /* Lzma */,
 				82F0BABC0D80B7660051C8A3 /* Branch */,
 				82F0BAC70D80B77E0051C8A3 /* 7z */,
 			);
@@ -101,19 +92,33 @@
 		1AB674ADFE9D54B511CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D2AAC046055464E500DB518D /* lib7z.a */,
+				D2AAC046055464E500DB518D /* liblzma_sdk.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		82F0BAAE0D80B7270051C8A3 /* LZMA */ = {
+		7B6606300E75D9BF00CE099E /* Configuration */ = {
+			isa = PBXGroup;
+			children = (
+				7B6606330E75D9DD00CE099E /* common.xcconfig */,
+				7B6606340E75D9DD00CE099E /* debug.xcconfig */,
+				7B6606350E75D9DD00CE099E /* executable.xcconfig */,
+				7B6606360E75D9DD00CE099E /* release.xcconfig */,
+				7B6606370E75D9DD00CE099E /* staticlib.xcconfig */,
+			);
+			name = Configuration;
+			path = ../../build;
+			sourceTree = "<group>";
+		};
+		82F0BAAE0D80B7270051C8A3 /* Lzma */ = {
 			isa = PBXGroup;
 			children = (
 				82F0BAAF0D80B7470051C8A3 /* LzmaTypes.h */,
 				82F0BAB00D80B7470051C8A3 /* LzmaDecode.h */,
 				82F0BAB10D80B7470051C8A3 /* LzmaDecode.c */,
 			);
-			name = LZMA;
+			name = Lzma;
+			path = Compress/Lzma;
 			sourceTree = "<group>";
 		};
 		82F0BAB50D80B74F0051C8A3 /* Common */ = {
@@ -129,13 +134,14 @@
 		82F0BABC0D80B7660051C8A3 /* Branch */ = {
 			isa = PBXGroup;
 			children = (
-				82F0BABD0D80B7760051C8A3 /* BranchX86.h */,
+				82F0BAC10D80B7760051C8A3 /* BranchTypes.h */,
 				82F0BABE0D80B7760051C8A3 /* BranchX86.c */,
-				82F0BABF0D80B7760051C8A3 /* BranchX86_2.h */,
+				82F0BABD0D80B7760051C8A3 /* BranchX86.h */,
 				82F0BAC00D80B7760051C8A3 /* BranchX86_2.c */,
-				82F0BAC10D80B7760051C8A3 /* BranchTypes.h */,
+				82F0BABF0D80B7760051C8A3 /* BranchX86_2.h */,
 			);
 			name = Branch;
+			path = Compress/Branch;
 			sourceTree = "<group>";
 		};
 		82F0BAC70D80B77E0051C8A3 /* 7z */ = {
@@ -159,41 +165,16 @@
 				82F0BAD70D80B7980051C8A3 /* 7zMethodID.h */,
 			);
 			name = 7z;
+			path = Archive/7z;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		D2AAC043055464E500DB518D /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				82F0BAB20D80B7470051C8A3 /* LzmaTypes.h in Headers */,
-				82F0BAB30D80B7470051C8A3 /* LzmaDecode.h in Headers */,
-				82F0BABA0D80B75B0051C8A3 /* 7zCrc.h in Headers */,
-				82F0BABB0D80B75B0051C8A3 /* Types.h in Headers */,
-				82F0BAC20D80B7760051C8A3 /* BranchX86.h in Headers */,
-				82F0BAC40D80B7760051C8A3 /* BranchX86_2.h in Headers */,
-				82F0BAC60D80B7760051C8A3 /* BranchTypes.h in Headers */,
-				82F0BAD90D80B7980051C8A3 /* 7zAlloc.h in Headers */,
-				82F0BADB0D80B7980051C8A3 /* 7zBuffer.h in Headers */,
-				82F0BADD0D80B7980051C8A3 /* 7zDecode.h in Headers */,
-				82F0BADF0D80B7980051C8A3 /* 7zExtract.h in Headers */,
-				82F0BAE10D80B7980051C8A3 /* 7zHeader.h in Headers */,
-				82F0BAE30D80B7980051C8A3 /* 7zIn.h in Headers */,
-				82F0BAE50D80B7980051C8A3 /* 7zItem.h in Headers */,
-				82F0BAE70D80B7980051C8A3 /* 7zMethodID.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
-		D2AAC045055464E500DB518D /* 7z */ = {
+		D2AAC045055464E500DB518D /* lzma_sdk */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "7z" */;
+			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "lzma_sdk" */;
 			buildPhases = (
-				D2AAC043055464E500DB518D /* Headers */,
 				D2AAC044055464E500DB518D /* Sources */,
 				D289987405E68DCB004EDB86 /* Frameworks */,
 			);
@@ -201,9 +182,9 @@
 			);
 			dependencies = (
 			);
-			name = 7z;
-			productName = 7z_C;
-			productReference = D2AAC046055464E500DB518D /* lib7z.a */;
+			name = lzma_sdk;
+			productName = lzma_sdk;
+			productReference = D2AAC046055464E500DB518D /* liblzma_sdk.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -211,14 +192,14 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "7z_C" */;
-			compatibilityVersion = "Xcode 3.0";
+			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "lzma_sdk" */;
+			compatibilityVersion = "Xcode 3.1";
 			hasScannedForEncodings = 1;
-			mainGroup = 08FB7794FE84155DC02AAC07 /* 7z_C */;
+			mainGroup = 08FB7794FE84155DC02AAC07 /* lzma_sdk */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				D2AAC045055464E500DB518D /* 7z */,
+				D2AAC045055464E500DB518D /* lzma_sdk */,
 			);
 		};
 /* End PBXProject section */
@@ -228,18 +209,18 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				82F0BAB40D80B7470051C8A3 /* LzmaDecode.c in Sources */,
-				82F0BAB90D80B75B0051C8A3 /* 7zCrc.c in Sources */,
-				82F0BAC30D80B7760051C8A3 /* BranchX86.c in Sources */,
-				82F0BAC50D80B7760051C8A3 /* BranchX86_2.c in Sources */,
 				82F0BAD80D80B7980051C8A3 /* 7zAlloc.c in Sources */,
 				82F0BADA0D80B7980051C8A3 /* 7zBuffer.c in Sources */,
+				82F0BAB90D80B75B0051C8A3 /* 7zCrc.c in Sources */,
 				82F0BADC0D80B7980051C8A3 /* 7zDecode.c in Sources */,
 				82F0BADE0D80B7980051C8A3 /* 7zExtract.c in Sources */,
 				82F0BAE00D80B7980051C8A3 /* 7zHeader.c in Sources */,
 				82F0BAE20D80B7980051C8A3 /* 7zIn.c in Sources */,
 				82F0BAE40D80B7980051C8A3 /* 7zItem.c in Sources */,
 				82F0BAE60D80B7980051C8A3 /* 7zMethodID.c in Sources */,
+				82F0BAC30D80B7760051C8A3 /* BranchX86.c in Sources */,
+				82F0BAC50D80B7760051C8A3 /* BranchX86_2.c in Sources */,
+				82F0BAB40D80B7470051C8A3 /* LzmaDecode.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -248,56 +229,40 @@
 /* Begin XCBuildConfiguration section */
 		1DEB91EC08733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7B6606370E75D9DD00CE099E /* staticlib.xcconfig */;
 			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = 7z;
-				ZERO_LINK = YES;
+				PRODUCT_NAME = lzma_sdk;
 			};
 			name = Debug;
 		};
 		1DEB91ED08733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7B6606370E75D9DD00CE099E /* staticlib.xcconfig */;
 			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = 7z;
+				PRODUCT_NAME = lzma_sdk;
 			};
 			name = Release;
 		};
 		1DEB91F008733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7B6606340E75D9DD00CE099E /* debug.xcconfig */;
 			buildSettings = {
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				XCODEPROJ_DEPTH = ../..;
 			};
 			name = Debug;
 		};
 		1DEB91F108733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7B6606360E75D9DD00CE099E /* release.xcconfig */;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				XCODEPROJ_DEPTH = ../..;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "7z" */ = {
+		1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "lzma_sdk" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB91EC08733DB70010E9CD /* Debug */,
@@ -306,7 +271,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "7z_C" */ = {
+		1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "lzma_sdk" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB91F008733DB70010E9CD /* Debug */,