bump ffmpeg from git-185a155 to git-0b32da9

[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 856caa1..4a20105 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -15,15 +15,23 @@
                253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 253886160BFE0C160064E995 /* HBOutputPanelController.m */; };
                25DE1FB60C169A0C00F01FC8 /* HBPreferencesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */; };
                25DE1FB70C169A0C00F01FC8 /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */; };
+               2713E6300F676510002E0A01 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2713E50C0F675F32002E0A01 /* libhb.a */; };
+               2713E6420F676526002E0A01 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2713E50C0F675F32002E0A01 /* libhb.a */; };
+               2728D25B0FE8419900758EC9 /* HandBrake-64.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2728D25A0FE8419900758EC9 /* HandBrake-64.icns */; };
+               274DD1E40FEF109900881E69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274DD1E30FEF109900881E69 /* libiconv.dylib */; };
+               274DD20B0FEF10FD00881E69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274DD1E30FEF109900881E69 /* libiconv.dylib */; };
+               2774BE900F66F47100B65FC6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */; };
+               2774BE920F66F48200B65FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE910F66F48200B65FC6 /* libz.dylib */; };
+               2774BEC70F66F61A00B65FC6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */; };
+               2774BEC80F66F61A00B65FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE910F66F48200B65FC6 /* libz.dylib */; };
                278070240F5C261300699207 /* ChapterTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = 593034E90BBA39A100172349 /* ChapterTitles.h */; };
                27AC71850F5A0AF600053B83 /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27AC71840F5A0AF600053B83 /* fakexcode.cpp */; };
-               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
                4DD93F8F082036E8008E1322 /* Controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; };
                4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1FD381073D19CE00E46515 /* HBPreviewController.h */; };
                4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
                4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
-               4DD93F9B082036E8008E1322 /* Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.mm */; };
-               4DD93F9E082036E8008E1322 /* HBPreviewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.mm */; };
+               4DD93F9B082036E8008E1322 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.m */; };
+               4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.m */; };
                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 */; };
@@ -32,8 +40,8 @@
                A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A20F47000EBB5EC2005B861B /* QTKit.framework */; };
                A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */ = {isa = PBXBuildFile; fileRef = A22C85EA0D05D35000C10E36 /* HBPresets.h */; };
                A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = A22C85EB0D05D35000C10E36 /* HBPresets.m */; };
+               A256080C0FD06720006A4277 /* Brushed_Window.png in Resources */ = {isa = PBXBuildFile; fileRef = A256080B0FD06720006A4277 /* Brushed_Window.png */; };
                A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A25962E00F15077500B3BF4E /* Quartz.framework */; };
-               A266019A0F2A1DC0007EA355 /* PictureFilters.xib in Resources */ = {isa = PBXBuildFile; fileRef = A26601980F2A1DC0007EA355 /* PictureFilters.xib */; };
                A273E0510C57B39A00493A45 /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04A0C57B39A00493A45 /* Pause.tiff */; };
                A273E0520C57B39A00493A45 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04B0C57B39A00493A45 /* Play.tiff */; };
                A273E0530C57B39A00493A45 /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04C0C57B39A00493A45 /* Stop.tiff */; };
@@ -43,11 +51,11 @@
                A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; };
                A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
                A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; };
-               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */; };
-               A2BF08050EFAB5D400C0E025 /* HBFilterController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BF08030EFAB5D400C0E025 /* HBFilterController.h */; };
-               A2BF08060EFAB5D400C0E025 /* HBFilterController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */; };
+               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */; };
                A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
                A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
+               A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D18AA50FD81C50003C997B /* HBSubtitles.h */; };
+               A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D18AA60FD81C50003C997B /* HBSubtitles.m */; };
                A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */; };
                A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */; };
                A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD600C998AD30082CA33 /* Drawer.tiff */; };
@@ -55,8 +63,14 @@
                A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD640C998AD30082CA33 /* pref-picture.tiff */; };
                A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD650C998AD30082CA33 /* Queue.tiff */; };
                A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD660C998AD30082CA33 /* Source.tiff */; };
+               A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; };
+               A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; };
                A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */; };
                A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */ = {isa = PBXBuildFile; fileRef = A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */; };
+               D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCB91240E82800BE2E98 /* HBAudio.h */; };
+               D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBA1240E82800BE2E98 /* HBAudio.m */; };
+               D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCBB1240E82800BE2E98 /* HBAudioController.h */; };
+               D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBC1240E82800BE2E98 /* HBAudioController.m */; };
                D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D289A9F20DBBE7AC00CE614B /* CoreServices.framework */; };
                D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
                E3003C7F0C88505D0072F2A8 /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */; };
@@ -136,17 +150,21 @@
                253886160BFE0C160064E995 /* HBOutputPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputPanelController.m; sourceTree = "<group>"; };
                25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreferencesController.h; sourceTree = "<group>"; };
                25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreferencesController.m; sourceTree = "<group>"; };
+               2713E50C0F675F32002E0A01 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               2728D25A0FE8419900758EC9 /* HandBrake-64.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "HandBrake-64.icns"; sourceTree = "<group>"; };
+               274DD1E30FEF109900881E69 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
+               2774BE8F0F66F47100B65FC6 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
+               2774BE910F66F48200B65FC6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
                27AC71840F5A0AF600053B83 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; };
                29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; 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>"; };
-               4D1125D709D72FD200E0657B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
                4D1FD381073D19CE00E46515 /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; };
-               4D1FD382073D19CE00E46515 /* HBPreviewController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HBPreviewController.mm; sourceTree = "<group>"; };
+               4D1FD382073D19CE00E46515 /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; };
                4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
                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>"; };
+               4DF3C8CC052889CD00A80101 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
                526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; };
                593034E90BBA39A100172349 /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = "<group>"; };
                593034EA0BBA39A100172349 /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = "<group>"; };
@@ -155,8 +173,8 @@
                A20F47000EBB5EC2005B861B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
                A22C85EA0D05D35000C10E36 /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = "<group>"; };
                A22C85EB0D05D35000C10E36 /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; };
+               A256080B0FD06720006A4277 /* Brushed_Window.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Brushed_Window.png; path = icons/Brushed_Window.png; sourceTree = "<group>"; };
                A25962E00F15077500B3BF4E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
-               A26601990F2A1DC0007EA355 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictureFilters.xib; sourceTree = "<group>"; };
                A273E04A0C57B39A00493A45 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; };
                A273E04B0C57B39A00493A45 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
                A273E04C0C57B39A00493A45 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; };
@@ -165,10 +183,10 @@
                A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; };
                A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
                A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
-               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
-               A2BF08030EFAB5D400C0E025 /* HBFilterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilterController.h; sourceTree = "<group>"; };
-               A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HBFilterController.mm; sourceTree = "<group>"; };
+               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; };
                A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
+               A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; };
+               A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; };
                A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; };
                A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; };
                A2D7AD600C998AD30082CA33 /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Drawer.tiff; sourceTree = "<group>"; };
@@ -176,8 +194,13 @@
                A2D7AD640C998AD30082CA33 /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-picture.tiff"; sourceTree = "<group>"; };
                A2D7AD650C998AD30082CA33 /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Queue.tiff; sourceTree = "<group>"; };
                A2D7AD660C998AD30082CA33 /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Source.tiff; sourceTree = "<group>"; };
+               A906A0500F7A7B210007A827 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
                A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; };
                A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
+               D234BCB91240E82800BE2E98 /* HBAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudio.h; sourceTree = "<group>"; };
+               D234BCBA1240E82800BE2E98 /* HBAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudio.m; sourceTree = "<group>"; };
+               D234BCBB1240E82800BE2E98 /* HBAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioController.h; sourceTree = "<group>"; };
+               D234BCBC1240E82800BE2E98 /* HBAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioController.m; sourceTree = "<group>"; };
                D289A9F20DBBE7AC00CE614B /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
                E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; };
                E3003CB40C8852B70072F2A8 /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; };
@@ -219,7 +242,12 @@
                        buildActionMask = 2147483647;
                        files = (
                                D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */,
+                               A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */,
                                D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */,
+                               2713E6300F676510002E0A01 /* libhb.a in Frameworks */,
+                               274DD1E40FEF109900881E69 /* libiconv.dylib in Frameworks */,
+                               2774BE900F66F47100B65FC6 /* libbz2.dylib in Frameworks */,
+                               2774BE920F66F48200B65FC6 /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -231,10 +259,14 @@
                                A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */,
                                A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */,
                                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */,
+                               A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */,
                                4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */,
-                               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */,
                                A29E05800BE1283E000533F5 /* Growl.framework in Frameworks */,
                                A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */,
+                               2713E6420F676526002E0A01 /* libhb.a in Frameworks */,
+                               274DD20B0FEF10FD00881E69 /* libiconv.dylib in Frameworks */,
+                               2774BEC70F66F61A00B65FC6 /* libbz2.dylib in Frameworks */,
+                               2774BEC80F66F61A00B65FC6 /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -259,7 +291,7 @@
                                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,
-                               A26601980F2A1DC0007EA355 /* PictureFilters.xib */,
+                               274DD1E30FEF109900881E69 /* libiconv.dylib */,
                        );
                        name = HandBrake;
                        sourceTree = "<group>";
@@ -267,9 +299,11 @@
                29B97317FDCFA39411CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                               A256080B0FD06720006A4277 /* Brushed_Window.png */,
                                A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */,
                                A273E0460C57B39A00493A45 /* icons */,
                                0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */,
+                               2728D25A0FE8419900758EC9 /* HandBrake-64.icns */,
                                E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */,
                                E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */,
                                E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */,
@@ -283,18 +317,21 @@
                29B97323FDCFA39411CA2CEA /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               A906A0500F7A7B210007A827 /* AudioToolbox.framework */,
                                A25962E00F15077500B3BF4E /* Quartz.framework */,
                                A20F47000EBB5EC2005B861B /* QTKit.framework */,
                                A20F46DB0EBB5E7A005B861B /* QuickTime.framework */,
                                D289A9F20DBBE7AC00CE614B /* CoreServices.framework */,
                                A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */,
                                A29E057F0BE1283E000533F5 /* Growl.framework */,
-                               4D1125D709D72FD200E0657B /* libz.dylib */,
                                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
                                4DEB2024052B055F00C39CA9 /* IOKit.framework */,
                                4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */,
                                29B97325FDCFA39411CA2CEA /* Foundation.framework */,
                                29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+                               2713E50C0F675F32002E0A01 /* libhb.a */,
+                               2774BE8F0F66F47100B65FC6 /* libbz2.dylib */,
+                               2774BE910F66F48200B65FC6 /* libz.dylib */,
                        );
                        name = Frameworks;
                        sourceTree = "<group>";
@@ -312,16 +349,20 @@
                526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
                        isa = PBXGroup;
                        children = (
-                               A2BF08030EFAB5D400C0E025 /* HBFilterController.h */,
-                               4DF3C8CC052889CD00A80101 /* Controller.mm */,
-                               A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */,
+                               D234BCB91240E82800BE2E98 /* HBAudio.h */,
+                               D234BCBA1240E82800BE2E98 /* HBAudio.m */,
+                               D234BCBB1240E82800BE2E98 /* HBAudioController.h */,
+                               D234BCBC1240E82800BE2E98 /* HBAudioController.m */,
+                               A2D18AA50FD81C50003C997B /* HBSubtitles.h */,
+                               A2D18AA60FD81C50003C997B /* HBSubtitles.m */,
+                               4DF3C8CB052889CD00A80101 /* Controller.h */,
+                               4DF3C8CC052889CD00A80101 /* Controller.m */,
                                A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
-                               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */,
+                               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */,
                                A22C85EA0D05D35000C10E36 /* HBPresets.h */,
                                A22C85EB0D05D35000C10E36 /* HBPresets.m */,
                                4D1FD381073D19CE00E46515 /* HBPreviewController.h */,
-                               4D1FD382073D19CE00E46515 /* HBPreviewController.mm */,
-                               4DF3C8CB052889CD00A80101 /* Controller.h */,
+                               4D1FD382073D19CE00E46515 /* HBPreviewController.m */,
                                593034E90BBA39A100172349 /* ChapterTitles.h */,
                                593034EA0BBA39A100172349 /* ChapterTitles.m */,
                                A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */,
@@ -399,9 +440,11 @@
                                A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */,
                                E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */,
                                A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */,
-                               A2BF08050EFAB5D400C0E025 /* HBFilterController.h in Headers */,
                                A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */,
                                278070240F5C261300699207 /* ChapterTitles.h in Headers */,
+                               A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */,
+                               D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */,
+                               D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -410,7 +453,7 @@
 /* Begin PBXLegacyTarget section */
                27F143770F5DF34F00A684FF /* external */ = {
                        isa = PBXLegacyTarget;
-                       buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake";
+                       buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake";
                        buildConfigurationList = 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */;
                        buildPhases = (
                        );
@@ -423,7 +466,7 @@
                };
                27F1437E0F5DF36000A684FF /* contrib */ = {
                        isa = PBXLegacyTarget;
-                       buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake";
+                       buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake";
                        buildConfigurationList = 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */;
                        buildPhases = (
                        );
@@ -436,7 +479,7 @@
                };
                27F143850F5DF37600A684FF /* libhb */ = {
                        isa = PBXLegacyTarget;
-                       buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake";
+                       buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake";
                        buildConfigurationList = 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */;
                        buildPhases = (
                        );
@@ -492,9 +535,19 @@
 /* Begin PBXProject section */
                29B97313FDCFA39411CA2CEA /* Project object */ = {
                        isa = PBXProject;
+                       attributes = {
+                               BuildIndependentTargetsInParallel = YES;
+                       };
                        buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
                        compatibilityVersion = "Xcode 3.1";
+                       developmentRegion = English;
                        hasScannedForEncodings = 1;
+                       knownRegions = (
+                               English,
+                               Japanese,
+                               French,
+                               German,
+                       );
                        mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
                        projectDirPath = "";
                        projectRoot = "";
@@ -554,7 +607,8 @@
                                E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */,
                                E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */,
                                A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */,
-                               A266019A0F2A1DC0007EA355 /* PictureFilters.xib in Resources */,
+                               A256080C0FD06720006A4277 /* Brushed_Window.png in Resources */,
+                               2728D25B0FE8419900758EC9 /* HandBrake-64.icns in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -577,8 +631,8 @@
                        files = (
                                59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */,
                                4DD93F9A082036E8008E1322 /* main.mm in Sources */,
-                               4DD93F9B082036E8008E1322 /* Controller.mm in Sources */,
-                               4DD93F9E082036E8008E1322 /* HBPreviewController.mm in Sources */,
+                               4DD93F9B082036E8008E1322 /* Controller.m in Sources */,
+                               4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */,
                                A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */,
                                253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */,
                                253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */,
@@ -587,8 +641,10 @@
                                A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */,
                                E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */,
                                A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
-                               A2BF08060EFAB5D400C0E025 /* HBFilterController.mm in Sources */,
-                               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */,
+                               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */,
+                               A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */,
+                               D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */,
+                               D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -616,14 +672,6 @@
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
                };
-               A26601980F2A1DC0007EA355 /* PictureFilters.xib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               A26601990F2A1DC0007EA355 /* English */,
-                       );
-                       name = PictureFilters.xib;
-                       sourceTree = "<group>";
-               };
                A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
@@ -686,31 +734,33 @@
                0DFF0C0D0B6BCEE000549488 /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrakeCLI;
                        };
@@ -719,104 +769,72 @@
                0DFF0C0E0B6BCEE000549488 /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrakeCLI;
                        };
                        name = standard;
                };
-               27ED6ADB0F58D7F100C905EE /* standard.i386 */ = {
+               27B4DEB20F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ARCHS = i386;
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
-                               EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 8;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
-                               EXTERNAL_PROJECT = ..;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
                                HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
                                IBC_NOTICES = NO;
                                IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
                                OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               SDKROOT = macosx10.5;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
                                SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
                                SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
                        name = standard.i386;
                };
-               27ED6ADE0F58D7F100C905EE /* standard.i386 */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               INSTALL_PATH = /usr/local/bin;
-                               OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
-                               );
-                               PRODUCT_NAME = HandBrakeCLI;
-                       };
-                       name = standard.i386;
-               };
-               27ED6ADF0F58D7F100C905EE /* standard.i386 */ = {
+               27B4DEB30F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               APPCAST_URL = "";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
                                IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
                                IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
                                INFOPLIST_FILE = Info.plist;
@@ -824,29 +842,30 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrake;
                                WARNING_CFLAGS = (
@@ -858,183 +877,96 @@
                        };
                        name = standard.i386;
                };
-               27ED6AE30F58D8F200C905EE /* standard.ppc */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = ppc;
-                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
-                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
-                               EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 8;
-                               EXTERNAL_METHOD = xcode;
-                               EXTERNAL_PROJECT = ..;
-                               GCC_DYNAMIC_NO_PIC = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
-                               IBC_NOTICES = NO;
-                               IBC_WARNINGS = NO;
-                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
-                               PREBINDING = NO;
-                               SDKROOT = macosx10.5;
-                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
-                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
-                       };
-                       name = standard.ppc;
-               };
-               27ED6AE60F58D8F200C905EE /* standard.ppc */ = {
+               27B4DEB40F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = standard.ppc;
+                       name = standard.i386;
                };
-               27ED6AE70F58D8F200C905EE /* standard.ppc */ = {
+               27B4DEB50F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               APPCAST_URL = "";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
-                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
-                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
-                               INFOPLIST_FILE = Info.plist;
-                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
-                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
-                               INFOPLIST_PREPROCESS = YES;
-                               OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
-                               );
-                               PRODUCT_NAME = HandBrake;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                               WRAPPER_EXTENSION = app;
+                               PRODUCT_NAME = external;
                        };
-                       name = standard.ppc;
+                       name = standard.i386;
+               };
+               27B4DEB60F65BAB600098046 /* standard.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.i386;
+               };
+               27B4DEB70F65BAB600098046 /* standard.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.i386;
                };
-               27ED6AFF0F58DE7400C905EE /* standard.x86_64 */ = {
+               27B4DEB80F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ARCHS = x86_64;
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
-                               EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 8;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
-                               EXTERNAL_PROJECT = ..;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
                                HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
                                IBC_NOTICES = NO;
                                IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
                                OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               SDKROOT = macosx10.5;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
                                SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
                                SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
                        name = standard.x86_64;
                };
-               27ED6B020F58DE7400C905EE /* standard.x86_64 */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               INSTALL_PATH = /usr/local/bin;
-                               OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
-                               );
-                               PRODUCT_NAME = HandBrakeCLI;
-                       };
-                       name = standard.x86_64;
-               };
-               27ED6B030F58DE7400C905EE /* standard.x86_64 */ = {
+               27B4DEB90F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               APPCAST_URL = "";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
                                IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
                                IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
                                INFOPLIST_FILE = Info.plist;
@@ -1042,29 +974,30 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrake;
                                WARNING_CFLAGS = (
@@ -1076,74 +1009,633 @@
                        };
                        name = standard.x86_64;
                };
-               27ED6B040F58DE7600C905EE /* standard.ppc64 */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = ppc64;
-                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
-                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
-                               EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 8;
-                               EXTERNAL_METHOD = xcode;
-                               EXTERNAL_PROJECT = ..;
-                               GCC_DYNAMIC_NO_PIC = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
-                               IBC_NOTICES = NO;
-                               IBC_WARNINGS = NO;
-                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
-                               PREBINDING = NO;
-                               SDKROOT = macosx10.5;
-                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
-                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
-                       };
-                       name = standard.ppc64;
-               };
-               27ED6B070F58DE7600C905EE /* standard.ppc64 */ = {
+               27B4DEBA0F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = standard.ppc64;
+                       name = standard.x86_64;
                };
-               27ED6B080F58DE7600C905EE /* standard.ppc64 */ = {
+               27B4DEBB0F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               APPCAST_URL = "";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBC0F65BAB700098046 /* standard.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBD0F65BAB700098046 /* standard.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBE0F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
+                               EXTERNAL_METHOD = xcode;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEBF0F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC00F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC10F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC20F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC30F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC40F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
+                               EXTERNAL_METHOD = xcode;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC50F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC60F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC70F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC80F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC90F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DECA0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = i386;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
+                               EXTERNAL_METHOD = xcode;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = debug.i386;
+               };
+               27B4DECB0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
+                       };
+                       name = debug.i386;
+               };
+               27B4DECC0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = debug.i386;
+               };
+               27B4DECD0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = debug.i386;
+               };
+               27B4DECE0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug.i386;
+               };
+               27B4DECF0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug.i386;
+               };
+               27B4DED00F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = x86_64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
+                               EXTERNAL_METHOD = xcode;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED10F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED20F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED30F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED40F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED50F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED60F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
+                               EXTERNAL_METHOD = xcode;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = debug.ppc;
+               };
+               27B4DED70F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
                                IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
                                IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
                                INFOPLIST_FILE = Info.plist;
@@ -1151,29 +1643,30 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrake;
                                WARNING_CFLAGS = (
@@ -1183,146 +1676,244 @@
                                );
                                WRAPPER_EXTENSION = app;
                        };
-                       name = standard.ppc64;
-               };
-               27F143780F5DF34F00A684FF /* standard */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = external;
-                       };
-                       name = standard;
-               };
-               27F143790F5DF34F00A684FF /* debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = external;
-                       };
-                       name = debug;
+                       name = debug.ppc;
                };
-               27F1437A0F5DF34F00A684FF /* standard.i386 */ = {
+               27B4DED80F65BABD00098046 /* debug.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = external;
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = standard.i386;
+                       name = debug.ppc;
                };
-               27F1437B0F5DF34F00A684FF /* standard.x86_64 */ = {
+               27B4DED90F65BABD00098046 /* debug.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                PRODUCT_NAME = external;
                        };
-                       name = standard.x86_64;
+                       name = debug.ppc;
                };
-               27F1437C0F5DF34F00A684FF /* standard.ppc */ = {
+               27B4DEDA0F65BABD00098046 /* debug.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = external;
+                               PRODUCT_NAME = libhb;
                        };
-                       name = standard.ppc;
+                       name = debug.ppc;
                };
-               27F1437D0F5DF34F00A684FF /* standard.ppc64 */ = {
+               27B4DEDB0F65BABD00098046 /* debug.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = external;
+                               PRODUCT_NAME = contrib;
                        };
-                       name = standard.ppc64;
+                       name = debug.ppc;
                };
-               27F1437F0F5DF36000A684FF /* standard */ = {
+               27B4DEDC0F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = contrib;
+                               ARCHS = ppc64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
+                               EXTERNAL_METHOD = xcode;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_DYNAMIC_NO_PIC = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = standard;
+                       name = debug.ppc64;
                };
-               27F143800F5DF36000A684FF /* debug */ = {
+               27B4DEDD0F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = contrib;
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
                        };
-                       name = debug;
+                       name = debug.ppc64;
                };
-               27F143810F5DF36000A684FF /* standard.i386 */ = {
+               27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = contrib;
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
+                               );
+                               PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = standard.i386;
+                       name = debug.ppc64;
                };
-               27F143820F5DF36000A684FF /* standard.x86_64 */ = {
+               27B4DEDF0F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = contrib;
+                               PRODUCT_NAME = external;
                        };
-                       name = standard.x86_64;
+                       name = debug.ppc64;
                };
-               27F143830F5DF36000A684FF /* standard.ppc */ = {
+               27B4DEE00F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = contrib;
+                               PRODUCT_NAME = libhb;
                        };
-                       name = standard.ppc;
+                       name = debug.ppc64;
                };
-               27F143840F5DF36000A684FF /* standard.ppc64 */ = {
+               27B4DEE10F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                PRODUCT_NAME = contrib;
                        };
-                       name = standard.ppc64;
+                       name = debug.ppc64;
                };
-               27F143860F5DF37600A684FF /* standard */ = {
+               27F143780F5DF34F00A684FF /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = libhb;
+                               PRODUCT_NAME = external;
                        };
                        name = standard;
                };
-               27F143870F5DF37600A684FF /* debug */ = {
+               27F143790F5DF34F00A684FF /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = libhb;
+                               PRODUCT_NAME = external;
                        };
                        name = debug;
                };
-               27F143880F5DF37600A684FF /* standard.i386 */ = {
+               27F1437F0F5DF36000A684FF /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = libhb;
+                               PRODUCT_NAME = contrib;
                        };
-                       name = standard.i386;
+                       name = standard;
                };
-               27F143890F5DF37600A684FF /* standard.x86_64 */ = {
+               27F143800F5DF36000A684FF /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = libhb;
+                               PRODUCT_NAME = contrib;
                        };
-                       name = standard.x86_64;
+                       name = debug;
                };
-               27F1438A0F5DF37600A684FF /* standard.ppc */ = {
+               27F143860F5DF37600A684FF /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                PRODUCT_NAME = libhb;
                        };
-                       name = standard.ppc;
+                       name = standard;
                };
-               27F1438B0F5DF37600A684FF /* standard.ppc64 */ = {
+               27F143870F5DF37600A684FF /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                PRODUCT_NAME = libhb;
                        };
-                       name = standard.ppc64;
+                       name = debug;
                };
                4D4E7BC1087804870051572B /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               APPCAST_URL = "";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
                                IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
                                IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
                                INFOPLIST_FILE = Info.plist;
@@ -1330,29 +1921,30 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrake;
                                WARNING_CFLAGS = (
@@ -1367,14 +1959,6 @@
                4D4E7BC2087804870051572B /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               APPCAST_URL = "";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
                                IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
                                IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
                                INFOPLIST_FILE = Info.plist;
@@ -1382,29 +1966,30 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       "$(EXTERNAL_BUILD)/libhb/libhb.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libass.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
-                                       "-lbz2",
-                                       "-lz",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
                                PRODUCT_NAME = HandBrake;
                                WARNING_CFLAGS = (
@@ -1423,19 +2008,26 @@
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
-                               EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 8;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
-                               EXTERNAL_PROJECT = ..;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
                                HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
                                IBC_NOTICES = NO;
                                IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
                                OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               SDKROOT = macosx10.5;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
                                SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
                                STRIP_INSTALLED_PRODUCT = NO;
                                SYMROOT = "$(EXTERNAL_BUILD)/macosx";
@@ -1447,19 +2039,26 @@
                        buildSettings = {
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
-                               EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
                                EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
-                               EXTERNAL_PROJECT = ..;
+                               EXTERNAL_SRC = ..;
+                               FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
                                HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
                                IBC_NOTICES = NO;
                                IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
                                OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               SDKROOT = macosx10.5;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
                                SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
                                SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
@@ -1472,11 +2071,15 @@
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                0DFF0C0E0B6BCEE000549488 /* standard */,
+                               27B4DEB40F65BAB600098046 /* standard.i386 */,
+                               27B4DEBA0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC00F65BAB800098046 /* standard.ppc */,
+                               27B4DEC60F65BAB900098046 /* standard.ppc64 */,
                                0DFF0C0D0B6BCEE000549488 /* debug */,
-                               27ED6ADE0F58D7F100C905EE /* standard.i386 */,
-                               27ED6B020F58DE7400C905EE /* standard.x86_64 */,
-                               27ED6AE60F58D8F200C905EE /* standard.ppc */,
-                               27ED6B070F58DE7600C905EE /* standard.ppc64 */,
+                               27B4DECC0F65BABC00098046 /* debug.i386 */,
+                               27B4DED20F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED80F65BABD00098046 /* debug.ppc */,
+                               27B4DEDE0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = standard;
@@ -1485,11 +2088,15 @@
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                27F143780F5DF34F00A684FF /* standard */,
+                               27B4DEB50F65BAB600098046 /* standard.i386 */,
+                               27B4DEBB0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC10F65BAB800098046 /* standard.ppc */,
+                               27B4DEC70F65BAB900098046 /* standard.ppc64 */,
                                27F143790F5DF34F00A684FF /* debug */,
-                               27F1437A0F5DF34F00A684FF /* standard.i386 */,
-                               27F1437B0F5DF34F00A684FF /* standard.x86_64 */,
-                               27F1437C0F5DF34F00A684FF /* standard.ppc */,
-                               27F1437D0F5DF34F00A684FF /* standard.ppc64 */,
+                               27B4DECD0F65BABC00098046 /* debug.i386 */,
+                               27B4DED30F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED90F65BABD00098046 /* debug.ppc */,
+                               27B4DEDF0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = standard;
@@ -1498,11 +2105,15 @@
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                27F1437F0F5DF36000A684FF /* standard */,
+                               27B4DEB70F65BAB600098046 /* standard.i386 */,
+                               27B4DEBD0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC30F65BAB800098046 /* standard.ppc */,
+                               27B4DEC90F65BAB900098046 /* standard.ppc64 */,
                                27F143800F5DF36000A684FF /* debug */,
-                               27F143810F5DF36000A684FF /* standard.i386 */,
-                               27F143820F5DF36000A684FF /* standard.x86_64 */,
-                               27F143830F5DF36000A684FF /* standard.ppc */,
-                               27F143840F5DF36000A684FF /* standard.ppc64 */,
+                               27B4DECF0F65BABC00098046 /* debug.i386 */,
+                               27B4DED50F65BABD00098046 /* debug.x86_64 */,
+                               27B4DEDB0F65BABD00098046 /* debug.ppc */,
+                               27B4DEE10F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = standard;
@@ -1511,11 +2122,15 @@
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                27F143860F5DF37600A684FF /* standard */,
+                               27B4DEB60F65BAB600098046 /* standard.i386 */,
+                               27B4DEBC0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC20F65BAB800098046 /* standard.ppc */,
+                               27B4DEC80F65BAB900098046 /* standard.ppc64 */,
                                27F143870F5DF37600A684FF /* debug */,
-                               27F143880F5DF37600A684FF /* standard.i386 */,
-                               27F143890F5DF37600A684FF /* standard.x86_64 */,
-                               27F1438A0F5DF37600A684FF /* standard.ppc */,
-                               27F1438B0F5DF37600A684FF /* standard.ppc64 */,
+                               27B4DECE0F65BABC00098046 /* debug.i386 */,
+                               27B4DED40F65BABD00098046 /* debug.x86_64 */,
+                               27B4DEDA0F65BABD00098046 /* debug.ppc */,
+                               27B4DEE00F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = standard;
@@ -1524,11 +2139,15 @@
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                4D4E7BC2087804870051572B /* standard */,
+                               27B4DEB30F65BAB600098046 /* standard.i386 */,
+                               27B4DEB90F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEBF0F65BAB800098046 /* standard.ppc */,
+                               27B4DEC50F65BAB900098046 /* standard.ppc64 */,
                                4D4E7BC1087804870051572B /* debug */,
-                               27ED6ADF0F58D7F100C905EE /* standard.i386 */,
-                               27ED6B030F58DE7400C905EE /* standard.x86_64 */,
-                               27ED6AE70F58D8F200C905EE /* standard.ppc */,
-                               27ED6B080F58DE7600C905EE /* standard.ppc64 */,
+                               27B4DECB0F65BABC00098046 /* debug.i386 */,
+                               27B4DED10F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED70F65BABD00098046 /* debug.ppc */,
+                               27B4DEDD0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = standard;
@@ -1537,11 +2156,15 @@
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                4D4E7BC6087804870051572B /* standard */,
+                               27B4DEB20F65BAB600098046 /* standard.i386 */,
+                               27B4DEB80F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEBE0F65BAB800098046 /* standard.ppc */,
+                               27B4DEC40F65BAB900098046 /* standard.ppc64 */,
                                4D4E7BC5087804870051572B /* debug */,
-                               27ED6ADB0F58D7F100C905EE /* standard.i386 */,
-                               27ED6AFF0F58DE7400C905EE /* standard.x86_64 */,
-                               27ED6AE30F58D8F200C905EE /* standard.ppc */,
-                               27ED6B040F58DE7600C905EE /* standard.ppc64 */,
+                               27B4DECA0F65BABC00098046 /* debug.i386 */,
+                               27B4DED00F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED60F65BABD00098046 /* debug.ppc */,
+                               27B4DEDC0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = standard;