X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHandBrake.xcodeproj%2Fproject.pbxproj;h=ce2d2602a35743bdd9d8a587924a162a9a88b3a0;hb=d6a4ae73b86cca10f2342c9e26c132855cad6356;hp=856caa101a950455e7fb411d352dff96b78d123e;hpb=5699565c38cf02344fc2956f70eb5c31fef4307c;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 856caa10..ce2d2602 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -15,9 +15,17 @@ 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 */; }; @@ -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 */; }; @@ -44,10 +52,10 @@ 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 */; }; 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,6 +63,8 @@ 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 */; }; D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D289A9F20DBBE7AC00CE614B /* CoreServices.framework */; }; @@ -136,11 +146,15 @@ 253886160BFE0C160064E995 /* HBOutputPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputPanelController.m; sourceTree = ""; }; 25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreferencesController.h; sourceTree = ""; }; 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreferencesController.m; sourceTree = ""; }; + 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 = ""; }; + 274DD1E30FEF109900881E69 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = ""; }; + 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 = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 4D1125D709D72FD200E0657B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = ""; }; 4D1FD381073D19CE00E46515 /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = ""; }; 4D1FD382073D19CE00E46515 /* HBPreviewController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HBPreviewController.mm; sourceTree = ""; }; 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; @@ -155,8 +169,8 @@ A20F47000EBB5EC2005B861B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; A22C85EA0D05D35000C10E36 /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = ""; }; A22C85EB0D05D35000C10E36 /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = ""; }; + A256080B0FD06720006A4277 /* Brushed_Window.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Brushed_Window.png; path = icons/Brushed_Window.png; sourceTree = ""; }; A25962E00F15077500B3BF4E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = ""; }; - A26601990F2A1DC0007EA355 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictureFilters.xib; sourceTree = ""; }; A273E04A0C57B39A00493A45 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = ""; }; A273E04B0C57B39A00493A45 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = ""; }; A273E04C0C57B39A00493A45 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = ""; }; @@ -166,9 +180,9 @@ A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = ""; }; A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = ""; }; A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = ""; }; - A2BF08030EFAB5D400C0E025 /* HBFilterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilterController.h; sourceTree = ""; }; - A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HBFilterController.mm; sourceTree = ""; }; A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; + A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = ""; }; + A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = ""; }; A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = ""; }; A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = ""; }; A2D7AD600C998AD30082CA33 /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Drawer.tiff; sourceTree = ""; }; @@ -176,6 +190,7 @@ A2D7AD640C998AD30082CA33 /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-picture.tiff"; sourceTree = ""; }; A2D7AD650C998AD30082CA33 /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Queue.tiff; sourceTree = ""; }; A2D7AD660C998AD30082CA33 /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Source.tiff; sourceTree = ""; }; + A906A0500F7A7B210007A827 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = ""; }; A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = ""; }; D289A9F20DBBE7AC00CE614B /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; @@ -219,7 +234,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 +251,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 +283,7 @@ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, - A26601980F2A1DC0007EA355 /* PictureFilters.xib */, + 274DD1E30FEF109900881E69 /* libiconv.dylib */, ); name = HandBrake; sourceTree = ""; @@ -267,9 +291,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 +309,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 = ""; @@ -312,15 +341,15 @@ 526FBC930B4CAA260064E04C /* HandBrake Sources */ = { isa = PBXGroup; children = ( - A2BF08030EFAB5D400C0E025 /* HBFilterController.h */, + A2D18AA50FD81C50003C997B /* HBSubtitles.h */, + A2D18AA60FD81C50003C997B /* HBSubtitles.m */, 4DF3C8CC052889CD00A80101 /* Controller.mm */, - A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */, A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */, A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */, A22C85EA0D05D35000C10E36 /* HBPresets.h */, A22C85EB0D05D35000C10E36 /* HBPresets.m */, - 4D1FD381073D19CE00E46515 /* HBPreviewController.h */, 4D1FD382073D19CE00E46515 /* HBPreviewController.mm */, + 4D1FD381073D19CE00E46515 /* HBPreviewController.h */, 4DF3C8CB052889CD00A80101 /* Controller.h */, 593034E90BBA39A100172349 /* ChapterTitles.h */, 593034EA0BBA39A100172349 /* ChapterTitles.m */, @@ -399,9 +428,9 @@ 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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -410,7 +439,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 +452,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 +465,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,6 +521,9 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + }; buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; @@ -554,7 +586,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; }; @@ -587,8 +620,8 @@ 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 */, + A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -616,14 +649,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - A26601980F2A1DC0007EA355 /* PictureFilters.xib */ = { - isa = PBXVariantGroup; - children = ( - A26601990F2A1DC0007EA355 /* English */, - ); - name = PictureFilters.xib; - sourceTree = ""; - }; A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */ = { isa = PBXVariantGroup; children = ( @@ -688,29 +713,26 @@ 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/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/libfaad.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", ); PRODUCT_NAME = HandBrakeCLI; }; @@ -721,320 +743,805 @@ 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/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/libfaad.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", ); 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 = 2; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; 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 */ = { + 27B4DEB30F65BAB600098046 /* standard.i386 */ = { isa = XCBuildConfiguration; buildSettings = { - INSTALL_PATH = /usr/local/bin; + 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/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/libfaad.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", ); - PRODUCT_NAME = HandBrakeCLI; + PRODUCT_NAME = HandBrake; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; }; name = standard.i386; }; - 27ED6ADF0F58D7F100C905EE /* standard.i386 */ = { + 27B4DEB40F65BAB600098046 /* 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; + 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/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/libfaad.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", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", + "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", + "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", + "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", ); - WRAPPER_EXTENSION = app; + PRODUCT_NAME = HandBrakeCLI; }; name = standard.i386; }; - 27ED6AE30F58D8F200C905EE /* standard.ppc */ = { + 27B4DEB50F65BAB600098046 /* standard.i386 */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ppc; + PRODUCT_NAME = external; + }; + 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; + }; + 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 = 2; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; 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.ppc; + name = standard.x86_64; }; - 27ED6AE60F58D8F200C905EE /* standard.ppc */ = { + 27B4DEB90F65BAB700098046 /* standard.x86_64 */ = { isa = XCBuildConfiguration; buildSettings = { - INSTALL_PATH = /usr/local/bin; + 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/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/libfaad.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", ); - PRODUCT_NAME = HandBrakeCLI; + PRODUCT_NAME = HandBrake; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; }; - name = standard.ppc; + name = standard.x86_64; }; - 27ED6AE70F58D8F200C905EE /* standard.ppc */ = { + 27B4DEBA0F65BAB700098046 /* 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; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; + 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/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/libfaad.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", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", + "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", + "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", + "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", ); - WRAPPER_EXTENSION = app; + PRODUCT_NAME = HandBrakeCLI; }; - name = standard.ppc; + name = standard.x86_64; }; - 27ED6AFF0F58DE7400C905EE /* standard.x86_64 */ = { + 27B4DEBB0F65BAB700098046 /* standard.x86_64 */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; + 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_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 8; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 2; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; 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; + name = standard.ppc; }; - 27ED6B020F58DE7400C905EE /* standard.x86_64 */ = { + 27B4DEBF0F65BAB800098046 /* standard.ppc */ = { isa = XCBuildConfiguration; buildSettings = { - INSTALL_PATH = /usr/local/bin; + 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/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/libfaad.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", ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = standard.x86_64; + 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 = { + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "$(EXTERNAL_BUILD)/contrib/lib/liba52.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/libfaad.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", + ); + 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 = 2; + EXTERNAL_METHOD = xcode; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + 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/liba52.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/libfaad.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", + ); + 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 = { + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "$(EXTERNAL_BUILD)/contrib/lib/liba52.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/libfaad.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", + ); + 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 = 2; + EXTERNAL_METHOD = xcode; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + 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/liba52.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/libfaad.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", + ); + 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 = { + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "$(EXTERNAL_BUILD)/contrib/lib/liba52.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/libfaad.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", + ); + 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 = 2; + EXTERNAL_METHOD = xcode; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + 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/liba52.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/libfaad.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", + ); + 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 = { + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "$(EXTERNAL_BUILD)/contrib/lib/liba52.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/libfaad.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", + ); + 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 = 2; + EXTERNAL_METHOD = xcode; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + 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.ppc; }; - 27ED6B030F58DE7400C905EE /* standard.x86_64 */ = { + 27B4DED70F65BABD00098046 /* debug.ppc */ = { 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 +1549,26 @@ 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/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/libfaad.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", ); PRODUCT_NAME = HandBrake; WARNING_CFLAGS = ( @@ -1074,76 +1578,95 @@ ); WRAPPER_EXTENSION = app; }; - 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; + name = debug.ppc; }; - 27ED6B070F58DE7600C905EE /* standard.ppc64 */ = { + 27B4DED80F65BABD00098046 /* debug.ppc */ = { 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/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/libfaad.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", ); PRODUCT_NAME = HandBrakeCLI; }; - name = standard.ppc64; + name = debug.ppc; + }; + 27B4DED90F65BABD00098046 /* debug.ppc */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = external; + }; + name = debug.ppc; + }; + 27B4DEDA0F65BABD00098046 /* debug.ppc */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = libhb; + }; + name = debug.ppc; + }; + 27B4DEDB0F65BABD00098046 /* debug.ppc */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = contrib; + }; + name = debug.ppc; }; - 27ED6B080F58DE7600C905EE /* standard.ppc64 */ = { + 27B4DEDC0F65BABD00098046 /* debug.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { - APPCAST_URL = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)", + 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 = 2; + EXTERNAL_METHOD = xcode; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + 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.ppc64; + }; + 27B4DEDD0F65BABD00098046 /* debug.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; @@ -1151,29 +1674,26 @@ 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/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/libfaad.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", ); PRODUCT_NAME = HandBrake; WARNING_CFLAGS = ( @@ -1183,49 +1703,72 @@ ); WRAPPER_EXTENSION = app; }; - name = standard.ppc64; + name = debug.ppc64; }; - 27F143780F5DF34F00A684FF /* standard */ = { + 27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { - PRODUCT_NAME = external; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "$(EXTERNAL_BUILD)/contrib/lib/liba52.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/libfaad.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", + ); + PRODUCT_NAME = HandBrakeCLI; }; - name = standard; + name = debug.ppc64; }; - 27F143790F5DF34F00A684FF /* debug */ = { + 27B4DEDF0F65BABD00098046 /* debug.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = external; }; - name = debug; + name = debug.ppc64; }; - 27F1437A0F5DF34F00A684FF /* standard.i386 */ = { + 27B4DEE00F65BABD00098046 /* debug.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { - PRODUCT_NAME = external; + PRODUCT_NAME = libhb; }; - name = standard.i386; + name = debug.ppc64; }; - 27F1437B0F5DF34F00A684FF /* standard.x86_64 */ = { + 27B4DEE10F65BABD00098046 /* debug.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { - PRODUCT_NAME = external; + PRODUCT_NAME = contrib; }; - name = standard.x86_64; + name = debug.ppc64; }; - 27F1437C0F5DF34F00A684FF /* standard.ppc */ = { + 27F143780F5DF34F00A684FF /* standard */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = external; }; - name = standard.ppc; + name = standard; }; - 27F1437D0F5DF34F00A684FF /* standard.ppc64 */ = { + 27F143790F5DF34F00A684FF /* debug */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = external; }; - name = standard.ppc64; + name = debug; }; 27F1437F0F5DF36000A684FF /* standard */ = { isa = XCBuildConfiguration; @@ -1241,34 +1784,6 @@ }; name = debug; }; - 27F143810F5DF36000A684FF /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.i386; - }; - 27F143820F5DF36000A684FF /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.x86_64; - }; - 27F143830F5DF36000A684FF /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.ppc; - }; - 27F143840F5DF36000A684FF /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.ppc64; - }; 27F143860F5DF37600A684FF /* standard */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1283,46 +1798,9 @@ }; name = debug; }; - 27F143880F5DF37600A684FF /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.i386; - }; - 27F143890F5DF37600A684FF /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.x86_64; - }; - 27F1438A0F5DF37600A684FF /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.ppc; - }; - 27F1438B0F5DF37600A684FF /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.ppc64; - }; 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 +1808,26 @@ 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/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/libfaad.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", ); PRODUCT_NAME = HandBrake; WARNING_CFLAGS = ( @@ -1367,14 +1842,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 +1849,26 @@ 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/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/libfaad.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", ); PRODUCT_NAME = HandBrake; WARNING_CFLAGS = ( @@ -1423,19 +1887,25 @@ 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 = 2; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; 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 +1917,25 @@ buildSettings = { CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 2; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; + FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; 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 +1948,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 +1965,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 +1982,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 +1999,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 +2016,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 +2033,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;