OSDN Git Service

(root) / handbrake-jp / handbrake-jp-git.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 a163f52..4a20105 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -67,6 +67,10 @@
                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 */; };
@@ -193,6 +197,10 @@
                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>"; };
@@ -341,6 +349,10 @@
                526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
                        isa = PBXGroup;
                        children = (
+                               D234BCB91240E82800BE2E98 /* HBAudio.h */,
+                               D234BCBA1240E82800BE2E98 /* HBAudio.m */,
+                               D234BCBB1240E82800BE2E98 /* HBAudioController.h */,
+                               D234BCBC1240E82800BE2E98 /* HBAudioController.m */,
                                A2D18AA50FD81C50003C997B /* HBSubtitles.h */,
                                A2D18AA60FD81C50003C997B /* HBSubtitles.m */,
                                4DF3C8CB052889CD00A80101 /* Controller.h */,
@@ -431,6 +443,8 @@
                                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;
                };
@@ -526,7 +540,14 @@
                        };
                        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 = "";
@@ -622,6 +643,8 @@
                                A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
                                A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */,
                                A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */,
+                               D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */,
+                               D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -716,15 +739,16 @@
                                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/libavcore.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/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",
@@ -736,6 +760,7 @@
                                        "$(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;
                        };
@@ -749,15 +774,16 @@
                                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/libavcore.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/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",
@@ -769,6 +795,7 @@
                                        "$(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;
                        };
@@ -781,7 +808,7 @@
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -817,15 +844,16 @@
                                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/libavcore.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/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",
@@ -837,6 +865,7 @@
                                        "$(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 = (
@@ -856,15 +885,16 @@
                                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/libavcore.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/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",
@@ -876,6 +906,7 @@
                                        "$(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;
                        };
@@ -909,7 +940,7 @@
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -945,15 +976,16 @@
                                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/libavcore.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/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",
@@ -965,6 +997,7 @@
                                        "$(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 = (
@@ -984,15 +1017,16 @@
                                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/libavcore.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/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",
@@ -1004,6 +1038,7 @@
                                        "$(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;
                        };
@@ -1037,7 +1072,7 @@
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1073,15 +1108,16 @@
                                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/libavcore.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/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",
@@ -1093,6 +1129,7 @@
                                        "$(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 = (
@@ -1112,15 +1149,16 @@
                                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/libavcore.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/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",
@@ -1132,6 +1170,7 @@
                                        "$(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;
                        };
@@ -1165,7 +1204,7 @@
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1201,15 +1240,16 @@
                                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/libavcore.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/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",
@@ -1221,6 +1261,7 @@
                                        "$(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 = (
@@ -1240,15 +1281,16 @@
                                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/libavcore.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/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",
@@ -1260,6 +1302,7 @@
                                        "$(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;
                        };
@@ -1295,7 +1338,7 @@
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1332,15 +1375,16 @@
                                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/libavcore.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/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",
@@ -1352,6 +1396,7 @@
                                        "$(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 = (
@@ -1371,15 +1416,16 @@
                                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/libavcore.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/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",
@@ -1391,6 +1437,7 @@
                                        "$(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;
                        };
@@ -1426,7 +1473,7 @@
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1463,15 +1510,16 @@
                                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/libavcore.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/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",
@@ -1483,6 +1531,7 @@
                                        "$(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 = (
@@ -1502,15 +1551,16 @@
                                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/libavcore.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/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",
@@ -1522,6 +1572,7 @@
                                        "$(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;
                        };
@@ -1557,7 +1608,7 @@
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1594,15 +1645,16 @@
                                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/libavcore.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/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",
@@ -1614,6 +1666,7 @@
                                        "$(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 = (
@@ -1633,15 +1686,16 @@
                                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/libavcore.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/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",
@@ -1653,6 +1707,7 @@
                                        "$(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;
                        };
@@ -1688,7 +1743,7 @@
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1725,15 +1780,16 @@
                                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/libavcore.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/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",
@@ -1745,6 +1801,7 @@
                                        "$(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 = (
@@ -1764,15 +1821,16 @@
                                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/libavcore.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/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",
@@ -1784,6 +1842,7 @@
                                        "$(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;
                        };
@@ -1864,15 +1923,16 @@
                                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/libavcore.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/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",
@@ -1884,6 +1944,7 @@
                                        "$(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 = (
@@ -1907,15 +1968,16 @@
                                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/libavcore.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/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",
@@ -1927,6 +1989,7 @@
                                        "$(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 = (
@@ -1946,7 +2009,7 @@
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1977,7 +2040,7 @@
                                CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
                                CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-                               EXTERNAL_JOBS = 2;
+                               EXTERNAL_JOBS = 1;
                                EXTERNAL_METHOD = xcode;
                                EXTERNAL_SRC = ..;
                                FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
githubのコードからのfolk
About OSDN
Find Software
Develop Software
Help