Latest MediaFork to HandBrake rename

[handbrake-jp/handbrake-jp-git.git] / macosx / HandBrake.xcodeproj / project.pbxproj

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 240f922..37f9f88 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -7,10 +7,78 @@
        objects = {
 
 /* Begin PBXBuildFile section */
+               0D096E010B707D3400A845D4 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9B0B4CAB100064E04C /* common.c */; };
+               0D096E020B707D3400A845D4 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9D0B4CAB100064E04C /* deca52.c */; };
+               0D096E030B707D3400A845D4 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9E0B4CAB100064E04C /* decavcodec.c */; };
+               0D096EA30B70884A00A845D4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
+               0DF377980B7BF99A00115CB0 /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DF377970B7BF99A00115CB0 /* fakexcode.cpp */; };
+               0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; };
+               0DFA5CC00B8DD3FE0020BC09 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; };
+               0DFA5CC10B8DD3FE0020BC09 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */; };
+               0DFA5CC20B8DD3FE0020BC09 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C800B8DD3B60020BC09 /* decsub.c */; };
+               0DFA5CC30B8DD3FE0020BC09 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */; };
+               0DFA5CC40B8DD3FE0020BC09 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C820B8DD3B60020BC09 /* dvd.c */; };
+               0DFA5CC50B8DD3FE0020BC09 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */; };
+               0DFA5CC60B8DD3FE0020BC09 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C840B8DD3B60020BC09 /* encfaac.c */; };
+               0DFA5CC70B8DD3FE0020BC09 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C850B8DD3B60020BC09 /* enclame.c */; };
+               0DFA5CC80B8DD3FE0020BC09 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */; };
+               0DFA5CC90B8DD3FE0020BC09 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C870B8DD3B60020BC09 /* encx264.c */; };
+               0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
+               0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
+               0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
+               0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
+               0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
+               0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
+               0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
+               0DFA5CD10B8DD3FE0020BC09 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C940B8DD3B60020BC09 /* muxogm.c */; };
+               0DFA5CD20B8DD3FE0020BC09 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C950B8DD3B60020BC09 /* ports.c */; };
+               0DFA5CD30B8DD3FE0020BC09 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C970B8DD3B60020BC09 /* reader.c */; };
+               0DFA5CD40B8DD3FE0020BC09 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C980B8DD3B60020BC09 /* render.c */; };
+               0DFA5CD50B8DD3FE0020BC09 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C990B8DD3B60020BC09 /* scan.c */; };
+               0DFA5CD60B8DD3FE0020BC09 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9A0B8DD3B60020BC09 /* sync.c */; };
+               0DFA5CD70B8DD3FE0020BC09 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9B0B8DD3B60020BC09 /* update.c */; };
+               0DFA5CD80B8DD3FE0020BC09 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9C0B8DD3B60020BC09 /* work.c */; };
+               0DFA5CD90B8DD4210020BC09 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; };
+               0DFA5CDA0B8DD4210020BC09 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */; };
+               0DFA5CDB0B8DD4210020BC09 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C800B8DD3B60020BC09 /* decsub.c */; };
+               0DFA5CDC0B8DD4210020BC09 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */; };
+               0DFA5CDD0B8DD4210020BC09 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C820B8DD3B60020BC09 /* dvd.c */; };
+               0DFA5CDE0B8DD4210020BC09 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */; };
+               0DFA5CDF0B8DD4210020BC09 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C840B8DD3B60020BC09 /* encfaac.c */; };
+               0DFA5CE00B8DD4210020BC09 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C850B8DD3B60020BC09 /* enclame.c */; };
+               0DFA5CE10B8DD4210020BC09 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */; };
+               0DFA5CE20B8DD4210020BC09 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C870B8DD3B60020BC09 /* encx264.c */; };
+               0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
+               0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
+               0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
+               0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
+               0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
+               0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
+               0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
+               0DFA5CEA0B8DD4210020BC09 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C940B8DD3B60020BC09 /* muxogm.c */; };
+               0DFA5CEB0B8DD4210020BC09 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C950B8DD3B60020BC09 /* ports.c */; };
+               0DFA5CEC0B8DD4210020BC09 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C970B8DD3B60020BC09 /* reader.c */; };
+               0DFA5CED0B8DD4210020BC09 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C980B8DD3B60020BC09 /* render.c */; };
+               0DFA5CEE0B8DD4210020BC09 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C990B8DD3B60020BC09 /* scan.c */; };
+               0DFA5CEF0B8DD4210020BC09 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9A0B8DD3B60020BC09 /* sync.c */; };
+               0DFA5CF00B8DD4210020BC09 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9B0B8DD3B60020BC09 /* update.c */; };
+               0DFA5CF10B8DD4210020BC09 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9C0B8DD3B60020BC09 /* work.c */; };
+               0DFA5CF80B8DD7B40020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; };
+               0DFA5D070B8DD9040020BC09 /* HandBrake.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5D060B8DD9040020BC09 /* HandBrake.plist */; };
+               0DFF0B770B6BC72A00549488 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9B0B4CAB100064E04C /* common.c */; };
+               0DFF0B790B6BC72A00549488 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9D0B4CAB100064E04C /* deca52.c */; };
+               0DFF0B7A0B6BC72A00549488 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9E0B4CAB100064E04C /* decavcodec.c */; };
+               0DFF0C100B6BCEE800549488 /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC760B4CA8F40064E04C /* test.c */; };
+               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
+               4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
                4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
                4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-               4D1EA3010993B13700FDC1A2 /* Portable.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Portable.nib */; };
-               4D1EA31C0993B24700FDC1A2 /* PortableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* PortableController.m */; };
+               4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Express.nib */; };
+               4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* ExpressController.m */; };
+               4D2AE78B09CCB24C007E18F6 /* DriveDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D2AE78909CCB24C007E18F6 /* DriveDetector.m */; };
+               4D2AEA1A09CCB332007E18F6 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
+               4D2AEA2909CCB8F9007E18F6 /* DriveDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D2AE78909CCB24C007E18F6 /* DriveDetector.m */; };
+               4D2AEA2A09CCB8FC007E18F6 /* DriveDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D2AE78A09CCB24C007E18F6 /* DriveDetector.h */; };
                4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3ECC2609A4917000B2E45F /* WhiteBox.m */; };
                4DD93F8F082036E8008E1322 /* Controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; };
                4DD93F90082036E8008E1322 /* PictureGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D85758F052B78E300C39CA9 /* PictureGLView.h */; };
@@ -20,7 +88,6 @@
                4DD93F94082036E8008E1322 /* PrefsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DE93A3507F5A2C900F3C78F /* PrefsController.h */; };
                4DD93F96082036E8008E1322 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
                4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-               4DD93F98082036E8008E1322 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D118405053054CD00C39CA9 /* HandBrake.icns */; };
                4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
                4DD93F9B082036E8008E1322 /* Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.mm */; };
                4DD93F9C082036E8008E1322 /* PictureGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D85758E052B78E300C39CA9 /* PictureGLView.mm */; };
@@ -31,76 +98,133 @@
                4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
                4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */; };
-               4DE09E63082038A400FB751F /* HandBrake.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DE09E62082038A400FB751F /* HandBrake.plist */; };
+               52AFF86A0B59BD07000DA7C4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+               52AFF86B0B59BD14000DA7C4 /* Express.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA2DC0993B01000FDC1A2 /* Express.plist */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-               4A9504CCFFE6A4B311CA0CBA /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               CURRENT_PROJECT_VERSION = 0.7.1;
-                               GCC_DYNAMIC_NO_PIC = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 3;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               LIBRARY_SEARCH_PATHS = "";
-                               ZERO_LINK = NO;
-                       };
-                       name = Development;
+/* Begin PBXContainerItemProxy section */
+               0D6E35900B6BD5FA005AABB3 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
+                       remoteInfo = libmediafork;
                };
-               4A9504CDFFE6A4B311CA0CBA /* Deployment */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               ZERO_LINK = NO;
-                       };
-                       name = Deployment;
+               0DFF0BF10B6BCCB400549488 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
+                       remoteInfo = libmediafork;
+               };
+               0DFF0BF30B6BCCB900549488 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
+                       remoteInfo = libmediafork;
                };
-/* End PBXBuildStyle section */
+/* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
                089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+               0D096DFF0B707D1200A845D4 /* libhb.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libhb.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+               0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               0DF377970B7BF99A00115CB0 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; };
+               0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
+               0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = declpcm.c; path = ../libhb/declpcm.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decmpeg2.c; path = ../libhb/decmpeg2.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C800B8DD3B60020BC09 /* decsub.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decsub.c; path = ../libhb/decsub.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = demuxmpeg.c; path = ../libhb/demuxmpeg.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C820B8DD3B60020BC09 /* dvd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dvd.c; path = ../libhb/dvd.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C830B8DD3B60020BC09 /* encavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encavcodec.c; path = ../libhb/encavcodec.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C840B8DD3B60020BC09 /* encfaac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encfaac.c; path = ../libhb/encfaac.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C850B8DD3B60020BC09 /* enclame.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = enclame.c; path = ../libhb/enclame.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C860B8DD3B60020BC09 /* encvorbis.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encvorbis.c; path = ../libhb/encvorbis.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C870B8DD3B60020BC09 /* encx264.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encx264.c; path = ../libhb/encx264.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C880B8DD3B60020BC09 /* encxvid.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encxvid.c; path = ../libhb/encxvid.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C890B8DD3B60020BC09 /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fifo.c; path = ../libhb/fifo.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C8A0B8DD3B60020BC09 /* hb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hb.c; path = ../libhb/hb.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ipodutil.cpp; path = ../libhb/ipodutil.cpp; sourceTree = SOURCE_ROOT; };
+               0DFA5C910B8DD3B60020BC09 /* muxavi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxavi.c; path = ../libhb/muxavi.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C920B8DD3B60020BC09 /* muxcommon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxcommon.c; path = ../libhb/muxcommon.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C930B8DD3B60020BC09 /* muxmp4.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxmp4.c; path = ../libhb/muxmp4.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C940B8DD3B60020BC09 /* muxogm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxogm.c; path = ../libhb/muxogm.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C950B8DD3B60020BC09 /* ports.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ports.c; path = ../libhb/ports.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C970B8DD3B60020BC09 /* reader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = reader.c; path = ../libhb/reader.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C980B8DD3B60020BC09 /* render.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = render.c; path = ../libhb/render.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C990B8DD3B60020BC09 /* scan.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scan.c; path = ../libhb/scan.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C9A0B8DD3B60020BC09 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sync.c; path = ../libhb/sync.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C9B0B8DD3B60020BC09 /* update.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = update.c; path = ../libhb/update.c; sourceTree = SOURCE_ROOT; };
+               0DFA5C9C0B8DD3B60020BC09 /* work.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = work.c; path = ../libhb/work.c; sourceTree = SOURCE_ROOT; };
+               0DFA5D060B8DD9040020BC09 /* HandBrake.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = HandBrake.plist; sourceTree = "<group>"; };
+               0DFF0B720B6BC6E600549488 /* libhb.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; };
                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
                29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-               4D118405053054CD00C39CA9 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
-               4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HandBrake Portable.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-               4D1EA2DC0993B01000FDC1A2 /* Portable.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Portable.plist; sourceTree = "<group>"; };
-               4D1EA3000993B13700FDC1A2 /* Portable.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Portable.nib; path = English.lproj/Portable.nib; sourceTree = "<group>"; };
-               4D1EA31A0993B24700FDC1A2 /* PortableController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PortableController.h; sourceTree = "<group>"; };
-               4D1EA31B0993B24700FDC1A2 /* PortableController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PortableController.m; sourceTree = "<group>"; };
+               4D1125D709D72FD200E0657B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
+               4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Instant HandBrake.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+               4D1EA2DC0993B01000FDC1A2 /* Express.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Express.plist; sourceTree = "<group>"; };
+               4D1EA3000993B13700FDC1A2 /* Express.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Express.nib; path = English.lproj/Express.nib; sourceTree = "<group>"; };
+               4D1EA31A0993B24700FDC1A2 /* ExpressController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExpressController.h; sourceTree = "<group>"; };
+               4D1EA31B0993B24700FDC1A2 /* ExpressController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ExpressController.m; sourceTree = "<group>"; };
                4D1FD381073D19CE00E46515 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
                4D1FD382073D19CE00E46515 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
+               4D2AE78909CCB24C007E18F6 /* DriveDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DriveDetector.m; sourceTree = "<group>"; };
+               4D2AE78A09CCB24C007E18F6 /* DriveDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DriveDetector.h; sourceTree = "<group>"; };
                4D3ECC2509A4917000B2E45F /* WhiteBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WhiteBox.h; sourceTree = "<group>"; };
                4D3ECC2609A4917000B2E45F /* WhiteBox.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WhiteBox.m; sourceTree = "<group>"; };
                4D85758E052B78E300C39CA9 /* PictureGLView.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureGLView.mm; sourceTree = "<group>"; };
                4D85758F052B78E300C39CA9 /* PictureGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PictureGLView.h; sourceTree = "<group>"; };
                4D86C74E07281F4E007BA979 /* ScanController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScanController.mm; sourceTree = "<group>"; };
                4D86C74F07281F4E007BA979 /* ScanController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScanController.h; sourceTree = "<group>"; };
-               4DD27BA507C0065C0023D231 /* QueueController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QueueController.h; sourceTree = SOURCE_ROOT; };
-               4DD27BA607C0065C0023D231 /* QueueController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QueueController.mm; sourceTree = SOURCE_ROOT; };
-               4DD93FA6082036E8008E1322 /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               4DD27BA507C0065C0023D231 /* QueueController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QueueController.h; sourceTree = "<group>"; };
+               4DD27BA607C0065C0023D231 /* QueueController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QueueController.mm; sourceTree = "<group>"; };
                4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-               4DE09E62082038A400FB751F /* HandBrake.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = HandBrake.plist; sourceTree = "<group>"; };
                4DE93A3507F5A2C900F3C78F /* PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefsController.h; sourceTree = "<group>"; };
                4DE93A3607F5A2C900F3C78F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefsController.m; sourceTree = "<group>"; };
                4DEB2024052B055F00C39CA9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
                4DF3C8CB052889CD00A80101 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
                4DF3C8CC052889CD00A80101 /* Controller.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = Controller.mm; sourceTree = "<group>"; };
+               526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; };
+               526FBC9B0B4CAB100064E04C /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../libhb/common.c; sourceTree = SOURCE_ROOT; };
+               526FBC9D0B4CAB100064E04C /* deca52.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deca52.c; path = ../libhb/deca52.c; sourceTree = SOURCE_ROOT; };
+               526FBC9E0B4CAB100064E04C /* decavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decavcodec.c; path = ../libhb/decavcodec.c; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+               0D096DFD0B707D1200A845D4 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0D096EA30B70884A00A845D4 /* libz.dylib in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0DFF0B700B6BC6E600549488 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0DFF0C080B6BCEC200549488 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                4D1EA2D80993B01000FDC1A2 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */,
+                               4D2AEA1A09CCB332007E18F6 /* IOKit.framework in Frameworks */,
+                               4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -111,59 +235,21 @@
                                4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */,
                                4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */,
                                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */,
+                               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-               080E96DDFE201D6D7F000001 /* Classes */ = {
-                       isa = PBXGroup;
-                       children = (
-                               4D1EA31A0993B24700FDC1A2 /* PortableController.h */,
-                               4D1EA31B0993B24700FDC1A2 /* PortableController.m */,
-                               4D1FD381073D19CE00E46515 /* PictureController.h */,
-                               4D1FD382073D19CE00E46515 /* PictureController.mm */,
-                               4DF3C8CB052889CD00A80101 /* Controller.h */,
-                               4DF3C8CC052889CD00A80101 /* Controller.mm */,
-                               4D86C74E07281F4E007BA979 /* ScanController.mm */,
-                               4D86C74F07281F4E007BA979 /* ScanController.h */,
-                               4D85758E052B78E300C39CA9 /* PictureGLView.mm */,
-                               4D85758F052B78E300C39CA9 /* PictureGLView.h */,
-                               4DD27BA507C0065C0023D231 /* QueueController.h */,
-                               4DD27BA607C0065C0023D231 /* QueueController.mm */,
-                               4DE93A3507F5A2C900F3C78F /* PrefsController.h */,
-                               4DE93A3607F5A2C900F3C78F /* PrefsController.m */,
-                               4D3ECC2509A4917000B2E45F /* WhiteBox.h */,
-                               4D3ECC2609A4917000B2E45F /* WhiteBox.m */,
-                       );
-                       name = Classes;
-                       sourceTree = "<group>";
-               };
-               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-                               4DEB2024052B055F00C39CA9 /* IOKit.framework */,
-                               4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */,
-                       );
-                       name = "Linked Frameworks";
-                       sourceTree = "<group>";
-               };
-               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               29B97325FDCFA39411CA2CEA /* Foundation.framework */,
-                               29B97324FDCFA39411CA2CEA /* AppKit.framework */,
-                       );
-                       name = "Other Frameworks";
-                       sourceTree = "<group>";
-               };
                19C28FACFE9D520D11CA2CBB /* Products */ = {
                        isa = PBXGroup;
                        children = (
-                               4DD93FA6082036E8008E1322 /* HandBrake.app */,
-                               4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */,
+                               4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */,
+                               0DFF0B720B6BC6E600549488 /* libhb.a */,
+                               0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */,
+                               0D6E35760B6BD4F0005AABB3 /* HandBrake.app */,
+                               0D096DFF0B707D1200A845D4 /* libhb.dylib */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -171,13 +257,14 @@
                29B97314FDCFA39411CA2CEA /* HandBrake */ = {
                        isa = PBXGroup;
                        children = (
-                               080E96DDFE201D6D7F000001 /* Classes */,
+                               526FBC940B4CAA310064E04C /* Instant HandBrake Sources */,
+                               526FBC930B4CAA260064E04C /* HandBrake Sources */,
+                               526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */,
+                               526FBC8D0B4CA9F90064E04C /* libhb Sources */,
                                29B97315FDCFA39411CA2CEA /* Other Sources */,
                                29B97317FDCFA39411CA2CEA /* Resources */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,
-                               4DE09E62082038A400FB751F /* HandBrake.plist */,
-                               4D1EA2DC0993B01000FDC1A2 /* Portable.plist */,
                        );
                        name = HandBrake;
                        sourceTree = "<group>";
@@ -193,9 +280,9 @@
                29B97317FDCFA39411CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                               0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */,
                                29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
-                               4D118405053054CD00C39CA9 /* HandBrake.icns */,
-                               4D1EA3000993B13700FDC1A2 /* Portable.nib */,
+                               4D1EA3000993B13700FDC1A2 /* Express.nib */,
                                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
                        );
                        name = Resources;
@@ -204,15 +291,111 @@
                29B97323FDCFA39411CA2CEA /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
-                               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-                               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+                               4D1125D709D72FD200E0657B /* libz.dylib */,
+                               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+                               4DEB2024052B055F00C39CA9 /* IOKit.framework */,
+                               4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */,
+                               29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+                               29B97324FDCFA39411CA2CEA /* AppKit.framework */,
                        );
                        name = Frameworks;
                        sourceTree = "<group>";
                };
+               526FBC8D0B4CA9F90064E04C /* libhb Sources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */,
+                               0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */,
+                               0DFA5C800B8DD3B60020BC09 /* decsub.c */,
+                               0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */,
+                               0DFA5C820B8DD3B60020BC09 /* dvd.c */,
+                               0DFA5C830B8DD3B60020BC09 /* encavcodec.c */,
+                               0DFA5C840B8DD3B60020BC09 /* encfaac.c */,
+                               0DFA5C850B8DD3B60020BC09 /* enclame.c */,
+                               0DFA5C860B8DD3B60020BC09 /* encvorbis.c */,
+                               0DFA5C870B8DD3B60020BC09 /* encx264.c */,
+                               0DFA5C880B8DD3B60020BC09 /* encxvid.c */,
+                               0DFA5C890B8DD3B60020BC09 /* fifo.c */,
+                               0DFA5C8A0B8DD3B60020BC09 /* hb.c */,
+                               0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */,
+                               0DFA5C910B8DD3B60020BC09 /* muxavi.c */,
+                               0DFA5C920B8DD3B60020BC09 /* muxcommon.c */,
+                               0DFA5C930B8DD3B60020BC09 /* muxmp4.c */,
+                               0DFA5C940B8DD3B60020BC09 /* muxogm.c */,
+                               0DFA5C950B8DD3B60020BC09 /* ports.c */,
+                               0DFA5C970B8DD3B60020BC09 /* reader.c */,
+                               0DFA5C980B8DD3B60020BC09 /* render.c */,
+                               0DFA5C990B8DD3B60020BC09 /* scan.c */,
+                               0DFA5C9A0B8DD3B60020BC09 /* sync.c */,
+                               0DFA5C9B0B8DD3B60020BC09 /* update.c */,
+                               0DFA5C9C0B8DD3B60020BC09 /* work.c */,
+                               526FBC9B0B4CAB100064E04C /* common.c */,
+                               526FBC9D0B4CAB100064E04C /* deca52.c */,
+                               526FBC9E0B4CAB100064E04C /* decavcodec.c */,
+                       );
+                       name = "libhb Sources";
+                       sourceTree = "<group>";
+               };
+               526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0DF377970B7BF99A00115CB0 /* fakexcode.cpp */,
+                               526FBC760B4CA8F40064E04C /* test.c */,
+                       );
+                       name = "HandBrakeCLI Sources";
+                       sourceTree = "<group>";
+               };
+               526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0DFA5D060B8DD9040020BC09 /* HandBrake.plist */,
+                               4D1FD381073D19CE00E46515 /* PictureController.h */,
+                               4D1FD382073D19CE00E46515 /* PictureController.mm */,
+                               4DF3C8CB052889CD00A80101 /* Controller.h */,
+                               4DF3C8CC052889CD00A80101 /* Controller.mm */,
+                               4D86C74E07281F4E007BA979 /* ScanController.mm */,
+                               4D86C74F07281F4E007BA979 /* ScanController.h */,
+                               4D85758E052B78E300C39CA9 /* PictureGLView.mm */,
+                               4D85758F052B78E300C39CA9 /* PictureGLView.h */,
+                               4DD27BA507C0065C0023D231 /* QueueController.h */,
+                               4DD27BA607C0065C0023D231 /* QueueController.mm */,
+                               4DE93A3507F5A2C900F3C78F /* PrefsController.h */,
+                               4DE93A3607F5A2C900F3C78F /* PrefsController.m */,
+                               4D3ECC2509A4917000B2E45F /* WhiteBox.h */,
+                               4D3ECC2609A4917000B2E45F /* WhiteBox.m */,
+                               4D2AE78909CCB24C007E18F6 /* DriveDetector.m */,
+                               4D2AE78A09CCB24C007E18F6 /* DriveDetector.h */,
+                       );
+                       name = "HandBrake Sources";
+                       sourceTree = "<group>";
+               };
+               526FBC940B4CAA310064E04C /* Instant HandBrake Sources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               4D1EA31A0993B24700FDC1A2 /* ExpressController.h */,
+                               4D1EA31B0993B24700FDC1A2 /* ExpressController.m */,
+                               4D1EA2DC0993B01000FDC1A2 /* Express.plist */,
+                       );
+                       name = "Instant HandBrake Sources";
+                       sourceTree = "<group>";
+               };
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
+               0D096DFB0B707D1200A845D4 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0DFF0B6E0B6BC6E600549488 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                4DD93F8E082036E8008E1322 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
@@ -223,15 +406,67 @@
                                4DD93F92082036E8008E1322 /* PictureController.h in Headers */,
                                4DD93F93082036E8008E1322 /* QueueController.h in Headers */,
                                4DD93F94082036E8008E1322 /* PrefsController.h in Headers */,
+                               4D2AEA2A09CCB8FC007E18F6 /* DriveDetector.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-               4D1EA2D90993B01000FDC1A2 /* HandBrake Portable */ = {
+               0D096DFE0B707D1200A845D4 /* libhb dlib */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libhb dlib" */;
+                       buildPhases = (
+                               0D096DFB0B707D1200A845D4 /* Headers */,
+                               0D096DFC0B707D1200A845D4 /* Sources */,
+                               0D096DFD0B707D1200A845D4 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = "libhb dlib";
+                       productName = "libmediafork dlib";
+                       productReference = 0D096DFF0B707D1200A845D4 /* libhb.dylib */;
+                       productType = "com.apple.product-type.library.dynamic";
+               };
+               0DFF0B710B6BC6E600549488 /* libhb */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */;
+                       buildPhases = (
+                               0DFF0B6E0B6BC6E600549488 /* Headers */,
+                               0DFF0B6F0B6BC6E600549488 /* Sources */,
+                               0DFF0B700B6BC6E600549488 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = libhb;
+                       productName = libmediafork;
+                       productReference = 0DFF0B720B6BC6E600549488 /* libhb.a */;
+                       productType = "com.apple.product-type.library.static";
+               };
+               0DFF0C090B6BCEC200549488 /* HandBrakeCLI */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */;
+                       buildPhases = (
+                               0DFF0C070B6BCEC200549488 /* Sources */,
+                               0DFF0C080B6BCEC200549488 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               0D6E35910B6BD5FA005AABB3 /* PBXTargetDependency */,
+                       );
+                       name = HandBrakeCLI;
+                       productName = HandBrakeCLI;
+                       productReference = 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */;
+                       productType = "com.apple.product-type.tool";
+               };
+               4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Portable" */;
+                       buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant HandBrake" */;
                        buildPhases = (
                                4D1EA2D60993B01000FDC1A2 /* Resources */,
                                4D1EA2D70993B01000FDC1A2 /* Sources */,
@@ -239,54 +474,12 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               INFOPLIST_FILE = "HandBrake Portable.plist";
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       AppKit,
-                               );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = "HandBrake Portable";
-                               WRAPPER_EXTENSION = app;
-                               ZERO_LINK = YES;
-                       };
                        dependencies = (
+                               0DFF0BF20B6BCCB400549488 /* PBXTargetDependency */,
                        );
-                       name = "HandBrake Portable";
-                       productName = "HandBrake Portable";
-                       productReference = 4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */;
-                       productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.HandBrake Portable</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-       <key>NSMainNibFile</key>
-       <string>MainMenu</string>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-</dict>
-</plist>
-";
+                       name = "Instant HandBrake";
+                       productName = "Instant HandBrake";
+                       productReference = 4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */;
                        productType = "com.apple.product-type.application";
                };
                4DD93F8D082036E8008E1322 /* HandBrake */ = {
@@ -300,46 +493,12 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               FRAMEWORK_SEARCH_PATHS = "";
-                               GCC_OPTIMIZATION_LEVEL = 3;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Info.plist;
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                               );
-                               PRODUCT_NAME = HandBrake;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                               WRAPPER_EXTENSION = app;
-                       };
                        dependencies = (
+                               0DFF0BF40B6BCCB900549488 /* PBXTargetDependency */,
                        );
                        name = HandBrake;
                        productName = HandBrake;
-                       productReference = 4DD93FA6082036E8008E1322 /* HandBrake.app */;
+                       productReference = 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */;
                        productType = "com.apple.product-type.application";
                };
 /* End PBXNativeTarget section */
@@ -348,20 +507,15 @@
                29B97313FDCFA39411CA2CEA /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
-                       buildSettings = {
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
-                       };
-                       buildStyles = (
-                               4A9504CCFFE6A4B311CA0CBA /* Development */,
-                               4A9504CDFFE6A4B311CA0CBA /* Deployment */,
-                       );
                        hasScannedForEncodings = 1;
                        mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
                        projectDirPath = "";
                        targets = (
                                4DD93F8D082036E8008E1322 /* HandBrake */,
-                               4D1EA2D90993B01000FDC1A2 /* HandBrake Portable */,
+                               4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */,
+                               0DFF0B710B6BC6E600549488 /* libhb */,
+                               0DFF0C090B6BCEC200549488 /* HandBrakeCLI */,
+                               0D096DFE0B707D1200A845D4 /* libhb dlib */,
                        );
                };
 /* End PBXProject section */
@@ -371,7 +525,10 @@
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               4D1EA3010993B13700FDC1A2 /* Portable.nib in Resources */,
+                               0DFA5CF80B8DD7B40020BC09 /* HandBrake.icns in Resources */,
+                               52AFF86B0B59BD14000DA7C4 /* Express.plist in Resources */,
+                               52AFF86A0B59BD07000DA7C4 /* InfoPlist.strings in Resources */,
+                               4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -379,23 +536,103 @@
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0DFA5D070B8DD9040020BC09 /* HandBrake.plist in Resources */,
                                4DD93F96082036E8008E1322 /* MainMenu.nib in Resources */,
                                4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */,
-                               4DD93F98082036E8008E1322 /* HandBrake.icns in Resources */,
-                               4DE09E63082038A400FB751F /* HandBrake.plist in Resources */,
+                               0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+               0D096DFC0B707D1200A845D4 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0DFA5CD90B8DD4210020BC09 /* declpcm.c in Sources */,
+                               0DFA5CDA0B8DD4210020BC09 /* decmpeg2.c in Sources */,
+                               0DFA5CDB0B8DD4210020BC09 /* decsub.c in Sources */,
+                               0DFA5CDC0B8DD4210020BC09 /* demuxmpeg.c in Sources */,
+                               0DFA5CDD0B8DD4210020BC09 /* dvd.c in Sources */,
+                               0DFA5CDE0B8DD4210020BC09 /* encavcodec.c in Sources */,
+                               0DFA5CDF0B8DD4210020BC09 /* encfaac.c in Sources */,
+                               0DFA5CE00B8DD4210020BC09 /* enclame.c in Sources */,
+                               0DFA5CE10B8DD4210020BC09 /* encvorbis.c in Sources */,
+                               0DFA5CE20B8DD4210020BC09 /* encx264.c in Sources */,
+                               0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */,
+                               0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */,
+                               0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */,
+                               0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */,
+                               0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */,
+                               0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */,
+                               0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */,
+                               0DFA5CEA0B8DD4210020BC09 /* muxogm.c in Sources */,
+                               0DFA5CEB0B8DD4210020BC09 /* ports.c in Sources */,
+                               0DFA5CEC0B8DD4210020BC09 /* reader.c in Sources */,
+                               0DFA5CED0B8DD4210020BC09 /* render.c in Sources */,
+                               0DFA5CEE0B8DD4210020BC09 /* scan.c in Sources */,
+                               0DFA5CEF0B8DD4210020BC09 /* sync.c in Sources */,
+                               0DFA5CF00B8DD4210020BC09 /* update.c in Sources */,
+                               0DFA5CF10B8DD4210020BC09 /* work.c in Sources */,
+                               0D096E010B707D3400A845D4 /* common.c in Sources */,
+                               0D096E020B707D3400A845D4 /* deca52.c in Sources */,
+                               0D096E030B707D3400A845D4 /* decavcodec.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0DFF0B6F0B6BC6E600549488 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0DFA5CC00B8DD3FE0020BC09 /* declpcm.c in Sources */,
+                               0DFA5CC10B8DD3FE0020BC09 /* decmpeg2.c in Sources */,
+                               0DFA5CC20B8DD3FE0020BC09 /* decsub.c in Sources */,
+                               0DFA5CC30B8DD3FE0020BC09 /* demuxmpeg.c in Sources */,
+                               0DFA5CC40B8DD3FE0020BC09 /* dvd.c in Sources */,
+                               0DFA5CC50B8DD3FE0020BC09 /* encavcodec.c in Sources */,
+                               0DFA5CC60B8DD3FE0020BC09 /* encfaac.c in Sources */,
+                               0DFA5CC70B8DD3FE0020BC09 /* enclame.c in Sources */,
+                               0DFA5CC80B8DD3FE0020BC09 /* encvorbis.c in Sources */,
+                               0DFA5CC90B8DD3FE0020BC09 /* encx264.c in Sources */,
+                               0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */,
+                               0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */,
+                               0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */,
+                               0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */,
+                               0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */,
+                               0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */,
+                               0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */,
+                               0DFA5CD10B8DD3FE0020BC09 /* muxogm.c in Sources */,
+                               0DFA5CD20B8DD3FE0020BC09 /* ports.c in Sources */,
+                               0DFA5CD30B8DD3FE0020BC09 /* reader.c in Sources */,
+                               0DFA5CD40B8DD3FE0020BC09 /* render.c in Sources */,
+                               0DFA5CD50B8DD3FE0020BC09 /* scan.c in Sources */,
+                               0DFA5CD60B8DD3FE0020BC09 /* sync.c in Sources */,
+                               0DFA5CD70B8DD3FE0020BC09 /* update.c in Sources */,
+                               0DFA5CD80B8DD3FE0020BC09 /* work.c in Sources */,
+                               0DFF0B770B6BC72A00549488 /* common.c in Sources */,
+                               0DFF0B790B6BC72A00549488 /* deca52.c in Sources */,
+                               0DFF0B7A0B6BC72A00549488 /* decavcodec.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0DFF0C070B6BCEC200549488 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0DFF0C100B6BCEE800549488 /* test.c in Sources */,
+                               0DF377980B7BF99A00115CB0 /* fakexcode.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                4D1EA2D70993B01000FDC1A2 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */,
-                               4D1EA31C0993B24700FDC1A2 /* PortableController.m in Sources */,
+                               4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */,
                                4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */,
+                               4D2AE78B09CCB24C007E18F6 /* DriveDetector.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -410,11 +647,30 @@
                                4DD93F9E082036E8008E1322 /* PictureController.mm in Sources */,
                                4DD93F9F082036E8008E1322 /* QueueController.mm in Sources */,
                                4DD93FA0082036E8008E1322 /* PrefsController.m in Sources */,
+                               4D2AEA2909CCB8F9007E18F6 /* DriveDetector.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+               0D6E35910B6BD5FA005AABB3 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0DFF0B710B6BC6E600549488 /* libhb */;
+                       targetProxy = 0D6E35900B6BD5FA005AABB3 /* PBXContainerItemProxy */;
+               };
+               0DFF0BF20B6BCCB400549488 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0DFF0B710B6BC6E600549488 /* libhb */;
+                       targetProxy = 0DFF0BF10B6BCCB400549488 /* PBXContainerItemProxy */;
+               };
+               0DFF0BF40B6BCCB900549488 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0DFF0B710B6BC6E600549488 /* libhb */;
+                       targetProxy = 0DFF0BF30B6BCCB900549488 /* PBXContainerItemProxy */;
+               };
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
                        isa = PBXVariantGroup;
@@ -435,30 +691,44 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-               4D1EA2DE0993B01100FDC1A2 /* Development */ = {
+               0D096E660B707D5800A845D4 /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
                                COPY_PHASE_STRIP = NO;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
                                GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_OPTIMIZATION_LEVEL = s;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Portable.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               LIBRARY_SEARCH_PATHS = "";
+                               MACOSX_DEPLOYMENT_TARGET = 10.4;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/libquicktime.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -466,36 +736,56 @@
                                        ../contrib/lib/libsamplerate.a,
                                        ../contrib/lib/libx264.a,
                                        ../contrib/lib/libxvidcore.a,
+                                       "-ldl",
+                                       "-flat_namespace",
+                                       "-read_only_relocs",
+                                       suppress,
                                );
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;
-                               PRODUCT_NAME = "HandBrake Portable";
-                               WRAPPER_EXTENSION = app;
+                               PRODUCT_NAME = hb;
+                               SEPARATE_STRIP = YES;
                                ZERO_LINK = NO;
                        };
                        name = Development;
                };
-               4D1EA2DF0993B01100FDC1A2 /* Deployment */ = {
+               0D096E670B707D5800A845D4 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
                                COPY_PHASE_STRIP = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
                                GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Portable.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               LIBRARY_SEARCH_PATHS = "";
+                               MACOSX_DEPLOYMENT_TARGET = 10.4;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/libquicktime.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -503,34 +793,54 @@
                                        ../contrib/lib/libsamplerate.a,
                                        ../contrib/lib/libx264.a,
                                        ../contrib/lib/libxvidcore.a,
+                                       "-ldl",
+                                       "-flat_namespace",
+                                       "-read_only_relocs",
+                                       suppress,
                                );
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;
-                               PRODUCT_NAME = "HandBrake Portable";
-                               WRAPPER_EXTENSION = app;
+                               PRODUCT_NAME = hb;
+                               SEPARATE_STRIP = YES;
                                ZERO_LINK = NO;
                        };
                        name = Deployment;
                };
-               4D1EA2E00993B01100FDC1A2 /* Default */ = {
+               0D096E680B707D5800A845D4 /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
                                GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Portable.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               LIBRARY_SEARCH_PATHS = "";
+                               MACOSX_DEPLOYMENT_TARGET = 10.4;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/libquicktime.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -538,39 +848,611 @@
                                        ../contrib/lib/libsamplerate.a,
                                        ../contrib/lib/libx264.a,
                                        ../contrib/lib/libxvidcore.a,
+                                       "-ldl",
+                                       "-flat_namespace",
+                                       "-read_only_relocs",
+                                       suppress,
                                );
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;
-                               PRODUCT_NAME = "HandBrake Portable";
-                               WRAPPER_EXTENSION = app;
+                               PRODUCT_NAME = hb;
+                               SEPARATE_STRIP = YES;
                                ZERO_LINK = NO;
                        };
                        name = Default;
                };
-               4D4E7BC1087804870051572B /* Development */ = {
+               0D096E690B707D5800A845D4 /* UB */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               CURRENT_PROJECT_VERSION = 0.7.1;
-                               FRAMEWORK_SEARCH_PATHS = "";
-                               GCC_DYNAMIC_NO_PIC = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 3;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = HandBrake.plist;
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               LIBRARY_SEARCH_PATHS = "";
+                               MACOSX_DEPLOYMENT_TARGET = 10.4;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
+                               OTHER_LDFLAGS = (
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                                       "-ldl",
+                                       "-flat_namespace",
+                                       "-read_only_relocs",
+                                       suppress,
+                               );
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               PREBINDING = NO;
+                               PRODUCT_NAME = hb;
+                               SEPARATE_STRIP = YES;
+                               ZERO_LINK = NO;
+                       };
+                       name = UB;
+               };
+               0D88F56B0B6CDCD400F81F26 /* UB */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
+                               OTHER_LDFLAGS = "";
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               PREBINDING = NO;
+                               PRODUCT_NAME = hb;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = UB;
+               };
+               0D88F56C0B6CDCD400F81F26 /* UB */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               CURRENT_PROJECT_VERSION = 0.8.0b1;
+                               FRAMEWORK_SEARCH_PATHS = "";
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INFOPLIST_FILE = HandBrake.plist;
+                               LIBRARY_SEARCH_PATHS = "";
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                               );
+                               PRODUCT_NAME = HandBrake;
+                               SECTORDER_FLAGS = "";
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
+                       };
+                       name = UB;
+               };
+               0D88F56D0B6CDCD400F81F26 /* UB */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INFOPLIST_FILE = Express.plist;
+                               INSTALL_PATH = "$(HOME)/Applications";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                               );
+                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = "Instant HandBrake";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               WRAPPER_EXTENSION = app;
+                               ZERO_LINK = NO;
+                       };
+                       name = UB;
+               };
+               0D88F56E0B6CDCD400F81F26 /* UB */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INSTALL_PATH = /usr/local/bin;
+                               LIBRARY_SEARCH_PATHS = "";
+                               OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
+                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                                       "-lz",
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = UB;
+               };
+               0D88F56F0B6CDCD400F81F26 /* UB */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = (
+                                       ppc,
+                                       i386,
+                               );
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                       };
+                       name = UB;
+               };
+               0DFF0B740B6BC70400549488 /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
+                               OTHER_LDFLAGS = "";
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               PREBINDING = NO;
+                               PRODUCT_NAME = hb;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = Development;
+               };
+               0DFF0B750B6BC70400549488 /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
+                               COPY_PHASE_STRIP = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
+                               OTHER_LDFLAGS = "";
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               PREBINDING = NO;
+                               PRODUCT_NAME = hb;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = Deployment;
+               };
+               0DFF0B760B6BC70400549488 /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "";
+                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-D__LIBHB__",
+                                       "-DSYS_DARWIN",
+                                       "$(OTHER_CFLAGS_QUOTED_1)",
+                                       "-DUSE_PTHREAD",
+                               );
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
+                               OTHER_LDFLAGS = "";
+                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               PREBINDING = NO;
+                               PRODUCT_NAME = hb;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = Default;
+               };
+               0DFF0C0D0B6BCEE000549488 /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INSTALL_PATH = /usr/local/bin;
+                               LIBRARY_SEARCH_PATHS = "";
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
                                        ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                                       "-lz",
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = Development;
+               };
+               0DFF0C0E0B6BCEE000549488 /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               COPY_PHASE_STRIP = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INSTALL_PATH = /usr/local/bin;
+                               LIBRARY_SEARCH_PATHS = "";
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                                       "-lz",
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = Deployment;
+               };
+               0DFF0C0F0B6BCEE000549488 /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INSTALL_PATH = /usr/local/bin;
+                               LIBRARY_SEARCH_PATHS = "";
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                                       "-lz",
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ZERO_LINK = NO;
+                       };
+                       name = Default;
+               };
+               4D1EA2DE0993B01100FDC1A2 /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INFOPLIST_FILE = Express.plist;
+                               INSTALL_PATH = "$(HOME)/Applications";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                               );
+                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = "Instant HandBrake";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               WRAPPER_EXTENSION = app;
+                               ZERO_LINK = NO;
+                       };
+                       name = Development;
+               };
+               4D1EA2DF0993B01100FDC1A2 /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INFOPLIST_FILE = Express.plist;
+                               INSTALL_PATH = "$(HOME)/Applications";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                               );
+                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = "Instant HandBrake";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               WRAPPER_EXTENSION = app;
+                               ZERO_LINK = NO;
+                       };
+                       name = Deployment;
+               };
+               4D1EA2E00993B01100FDC1A2 /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INFOPLIST_FILE = Express.plist;
+                               INSTALL_PATH = "$(HOME)/Applications";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                               );
+                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
+                                       ../contrib/lib/libmpeg2.a,
+                                       ../contrib/lib/libvorbis.a,
+                                       ../contrib/lib/libvorbisenc.a,
+                                       ../contrib/lib/libogg.a,
+                                       ../contrib/lib/libsamplerate.a,
+                                       ../contrib/lib/libx264.a,
+                                       ../contrib/lib/libxvidcore.a,
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = "Instant HandBrake";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               WRAPPER_EXTENSION = app;
+                               ZERO_LINK = NO;
+                       };
+                       name = Default;
+               };
+               4D4E7BC1087804870051572B /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               COPY_PHASE_STRIP = NO;
+                               CURRENT_PROJECT_VERSION = 0.8.0b1;
+                               FRAMEWORK_SEARCH_PATHS = "";
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               HEADER_SEARCH_PATHS = ../libhb;
+                               INFOPLIST_FILE = HandBrake.plist;
+                               LIBRARY_SEARCH_PATHS = "";
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = (
+                                       ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
+                                       ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
+                                       ../contrib/lib/libavcodec.a,
+                                       ../contrib/lib/libavutil.a,
+                                       ../contrib/lib/libdvdread.a,
+                                       ../contrib/lib/libdvdcss.a,
+                                       ../contrib/lib/libfaac.a,
+                                       ../contrib/lib/libmp3lame.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -594,10 +1476,12 @@
                4D4E7BC2087804870051572B /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
                                COPY_PHASE_STRIP = YES;
+                               CURRENT_PROJECT_VERSION = 0.8.0b1;
                                FRAMEWORK_SEARCH_PATHS = "";
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_OPTIMIZATION_LEVEL = 3;
+                               GCC_OPTIMIZATION_LEVEL = s;
                                GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                HEADER_SEARCH_PATHS = ../libhb;
                                INFOPLIST_FILE = HandBrake.plist;
@@ -605,14 +1489,16 @@
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -636,8 +1522,10 @@
                4D4E7BC3087804870051572B /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = ..;
+                               CURRENT_PROJECT_VERSION = 0.8.0b1;
                                FRAMEWORK_SEARCH_PATHS = "";
-                               GCC_OPTIMIZATION_LEVEL = 3;
+                               GCC_OPTIMIZATION_LEVEL = s;
                                GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                HEADER_SEARCH_PATHS = ../libhb;
                                INFOPLIST_FILE = HandBrake.plist;
@@ -645,14 +1533,16 @@
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
+                                       ../contrib/lib/libquicktime.a,
+                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -675,30 +1565,70 @@
                4D4E7BC5087804870051572B /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Development;
                };
                4D4E7BC6087804870051572B /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Deployment;
                };
                4D4E7BC7087804870051572B /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Default;
                };
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-               4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Portable" */ = {
+               0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libhb dlib" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               0D096E660B707D5800A845D4 /* Development */,
+                               0D096E670B707D5800A845D4 /* Deployment */,
+                               0D096E680B707D5800A845D4 /* Default */,
+                               0D096E690B707D5800A845D4 /* UB */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Default;
+               };
+               0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               0DFF0B740B6BC70400549488 /* Development */,
+                               0DFF0B750B6BC70400549488 /* Deployment */,
+                               0DFF0B760B6BC70400549488 /* Default */,
+                               0D88F56B0B6CDCD400F81F26 /* UB */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Default;
+               };
+               0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               0DFF0C0D0B6BCEE000549488 /* Development */,
+                               0DFF0C0E0B6BCEE000549488 /* Deployment */,
+                               0DFF0C0F0B6BCEE000549488 /* Default */,
+                               0D88F56E0B6CDCD400F81F26 /* UB */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Default;
+               };
+               4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant HandBrake" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                4D1EA2DE0993B01100FDC1A2 /* Development */,
                                4D1EA2DF0993B01100FDC1A2 /* Deployment */,
                                4D1EA2E00993B01100FDC1A2 /* Default */,
+                               0D88F56D0B6CDCD400F81F26 /* UB */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Default;
@@ -709,6 +1639,7 @@
                                4D4E7BC1087804870051572B /* Development */,
                                4D4E7BC2087804870051572B /* Deployment */,
                                4D4E7BC3087804870051572B /* Default */,
+                               0D88F56C0B6CDCD400F81F26 /* UB */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Default;
@@ -719,6 +1650,7 @@
                                4D4E7BC5087804870051572B /* Development */,
                                4D4E7BC6087804870051572B /* Deployment */,
                                4D4E7BC7087804870051572B /* Default */,
+                               0D88F56F0B6CDCD400F81F26 /* UB */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Default;