diff options
6 files changed, 110 insertions, 52 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 8ef0f45a5..a17d087aa 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -6,6 +6,21 @@ objectVersion = 47; objects = { +/* Begin PBXAggregateTarget section */ + A96A4F7C217A4C2B00755E35 /* FakeTarget */ = { + isa = PBXAggregateTarget; + buildConfigurationList = A96A4F81217A4C2B00755E35 /* Build configuration list for PBXAggregateTarget "FakeTarget" */; + buildPhases = ( + A96A4F82217A4C3400755E35 /* ShellScript */, + ); + dependencies = ( + A96A4F8A217A4D1F00755E35 /* PBXTargetDependency */, + ); + name = FakeTarget; + productName = FakeTarget; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 1C0695AC20BD193D001543DA /* libpostproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0695AA20BD193D001543DA /* libpostproc.a */; }; 1C0695AD20BD193D001543DA /* libpostproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0695AA20BD193D001543DA /* libpostproc.a */; }; @@ -258,33 +273,40 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 273F217614ADD2580021BE6D /* PBXContainerItemProxy */ = { + A91CE2EE1C7DB40D0068F46F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; proxyType = 1; - remoteGlobalIDString = 273F216E14ADD2170021BE6D; - remoteInfo = external; + remoteGlobalIDString = A9736F011C7DA5FE008F1D18; + remoteInfo = HandBrakeKit; }; - A91CE2AE1C7DA74D0068F46F /* PBXContainerItemProxy */ = { + A91CE2FF1C7DBA2C0068F46F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; proxyType = 1; - remoteGlobalIDString = 273F216E14ADD2170021BE6D; - remoteInfo = external; + remoteGlobalIDString = 273F203814ADBC200021BE6D; + remoteInfo = HandBrake; }; - A91CE2EE1C7DB40D0068F46F /* PBXContainerItemProxy */ = { + A96A4F85217A4C8900755E35 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; proxyType = 1; - remoteGlobalIDString = A9736F011C7DA5FE008F1D18; - remoteInfo = HandBrakeKit; + remoteGlobalIDString = A96A4F7C217A4C2B00755E35; + remoteInfo = FakeTarget; }; - A91CE2FF1C7DBA2C0068F46F /* PBXContainerItemProxy */ = { + A96A4F87217A4C8F00755E35 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; proxyType = 1; - remoteGlobalIDString = 273F203814ADBC200021BE6D; - remoteInfo = HandBrake; + remoteGlobalIDString = A96A4F7C217A4C2B00755E35; + remoteInfo = FakeTarget; + }; + A96A4F89217A4D1F00755E35 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 273F216E14ADD2170021BE6D; + remoteInfo = external; }; A9736F0D1C7DA5FE008F1D18 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -1392,7 +1414,6 @@ isa = PBXNativeTarget; buildConfigurationList = 273F200714ADAE950021BE6D /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */; buildPhases = ( - A9E356C72178B78A00E8E61B /* ShellScript */, 273F1FFB14ADAE950021BE6D /* Sources */, 273F1FFC14ADAE950021BE6D /* Frameworks */, 273F1FFD14ADAE950021BE6D /* CopyFiles */, @@ -1400,7 +1421,7 @@ buildRules = ( ); dependencies = ( - 273F217714ADD2580021BE6D /* PBXTargetDependency */, + A96A4F86217A4C8900755E35 /* PBXTargetDependency */, ); name = HandBrakeCLI; productName = HandBrakeCLI; @@ -1430,7 +1451,6 @@ isa = PBXNativeTarget; buildConfigurationList = A9736F1D1C7DA5FE008F1D18 /* Build configuration list for PBXNativeTarget "HandBrakeKit" */; buildPhases = ( - A9E356C62178B68300E8E61B /* ShellScript */, A9736EFD1C7DA5FE008F1D18 /* Sources */, A9736EFE1C7DA5FE008F1D18 /* Frameworks */, A9736EFF1C7DA5FE008F1D18 /* Headers */, @@ -1439,7 +1459,7 @@ buildRules = ( ); dependencies = ( - A91CE2AF1C7DA74D0068F46F /* PBXTargetDependency */, + A96A4F88217A4C8F00755E35 /* PBXTargetDependency */, ); name = HandBrakeKit; productName = HandBrakeKit; @@ -1471,7 +1491,7 @@ 273F1FE014AD9DA40021BE6D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1010; TargetAttributes = { 273F203814ADBC200021BE6D = { SystemCapabilities = { @@ -1486,6 +1506,10 @@ }; }; }; + A96A4F7C217A4C2B00755E35 = { + CreatedOnToolsVersion = 10.1; + ProvisioningStyle = Automatic; + }; A9736F011C7DA5FE008F1D18 = { CreatedOnToolsVersion = 7.3; }; @@ -1511,6 +1535,7 @@ projectRoot = ""; targets = ( 273F216E14ADD2170021BE6D /* external */, + A96A4F7C217A4C2B00755E35 /* FakeTarget */, 273F1FFE14ADAE950021BE6D /* HandBrakeCLI */, A9736F011C7DA5FE008F1D18 /* HandBrakeKit */, A9736F0A1C7DA5FE008F1D18 /* HandBrakeKitTests */, @@ -1583,7 +1608,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - A9E356C62178B68300E8E61B /* ShellScript */ = { + A96A4F82217A4C3400755E35 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1603,25 +1628,6 @@ shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n"; showEnvVarsInLog = 0; }; - A9E356C72178B78A00E8E61B /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - "\"$(EXTERNAL_BUILD)/libhb/hb.h\"", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -1748,16 +1754,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 273F217714ADD2580021BE6D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 273F216E14ADD2170021BE6D /* external */; - targetProxy = 273F217614ADD2580021BE6D /* PBXContainerItemProxy */; - }; - A91CE2AF1C7DA74D0068F46F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 273F216E14ADD2170021BE6D /* external */; - targetProxy = A91CE2AE1C7DA74D0068F46F /* PBXContainerItemProxy */; - }; A91CE2EF1C7DB40D0068F46F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = A9736F011C7DA5FE008F1D18 /* HandBrakeKit */; @@ -1768,6 +1764,21 @@ target = 273F203814ADBC200021BE6D /* HandBrake */; targetProxy = A91CE2FF1C7DBA2C0068F46F /* PBXContainerItemProxy */; }; + A96A4F86217A4C8900755E35 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A96A4F7C217A4C2B00755E35 /* FakeTarget */; + targetProxy = A96A4F85217A4C8900755E35 /* PBXContainerItemProxy */; + }; + A96A4F88217A4C8F00755E35 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A96A4F7C217A4C2B00755E35 /* FakeTarget */; + targetProxy = A96A4F87217A4C8F00755E35 /* PBXContainerItemProxy */; + }; + A96A4F8A217A4D1F00755E35 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 273F216E14ADD2170021BE6D /* external */; + targetProxy = A96A4F89217A4D1F00755E35 /* PBXContainerItemProxy */; + }; A9736F0E1C7DA5FE008F1D18 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = A9736F011C7DA5FE008F1D18 /* HandBrakeKit */; @@ -2295,6 +2306,42 @@ }; name = release; }; + A96A4F7D217A4C2B00755E35 /* debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = debug; + }; + A96A4F7E217A4C2B00755E35 /* debug-sandbox */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "debug-sandbox"; + }; + A96A4F7F217A4C2B00755E35 /* release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = release; + }; + A96A4F80217A4C2B00755E35 /* release-sandbox */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "release-sandbox"; + }; A9736F191C7DA5FE008F1D18 /* debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3040,6 +3087,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = release; }; + A96A4F81217A4C2B00755E35 /* Build configuration list for PBXAggregateTarget "FakeTarget" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A96A4F7D217A4C2B00755E35 /* debug */, + A96A4F7E217A4C2B00755E35 /* debug-sandbox */, + A96A4F7F217A4C2B00755E35 /* release */, + A96A4F80217A4C2B00755E35 /* release-sandbox */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = release; + }; A9736F1D1C7DA5FE008F1D18 /* Build configuration list for PBXNativeTarget "HandBrakeKit" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme index 9c43aaca5..de32f3600 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1000" + LastUpgradeVersion = "1010" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme index d7c6f1174..712b607df 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1000" + LastUpgradeVersion = "1010" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme index 4c8e96522..4d31568c7 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1000" + LastUpgradeVersion = "1010" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme index 7d4baed6c..a3433f97b 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1000" + LastUpgradeVersion = "1010" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme index 1a88024d5..907022fea 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1000" + LastUpgradeVersion = "1010" version = "1.3"> <BuildAction parallelizeBuildables = "YES" |