diff options
| author | Damiano Galassi <[email protected]> | 2018-10-18 15:55:53 +0200 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2018-10-18 15:55:53 +0200 |
| commit | a39ac4b832a46bbc8374e346e08ebd4ea8e2428e (patch) | |
| tree | d2791647d114fcaf2fd073c05dfc71de8b1b4a2b /macosx | |
| parent | 639b9c7648897a0029276799ad849721b1e32888 (diff) | |
build: add a workaround to the Xcode project to make it work with the new Xcode build system
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 48 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings | 2 |
2 files changed, 44 insertions, 6 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index ca90dc525..8ef0f45a5 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -1392,6 +1392,7 @@ isa = PBXNativeTarget; buildConfigurationList = 273F200714ADAE950021BE6D /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */; buildPhases = ( + A9E356C72178B78A00E8E61B /* ShellScript */, 273F1FFB14ADAE950021BE6D /* Sources */, 273F1FFC14ADAE950021BE6D /* Frameworks */, 273F1FFD14ADAE950021BE6D /* CopyFiles */, @@ -1429,6 +1430,7 @@ isa = PBXNativeTarget; buildConfigurationList = A9736F1D1C7DA5FE008F1D18 /* Build configuration list for PBXNativeTarget "HandBrakeKit" */; buildPhases = ( + A9E356C62178B68300E8E61B /* ShellScript */, A9736EFD1C7DA5FE008F1D18 /* Sources */, A9736EFE1C7DA5FE008F1D18 /* Frameworks */, A9736EFF1C7DA5FE008F1D18 /* Headers */, @@ -1580,6 +1582,48 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + A9E356C62178B68300E8E61B /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + "\"$(EXTERNAL_BUILD)/libhb/hb_dict.h\"", + "\"$(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; + }; + 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 */ 273F1FFB14ADAE950021BE6D /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -2128,7 +2172,6 @@ 273F200814ADAE950021BE6D /* debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; @@ -2154,7 +2197,6 @@ 273F200914ADAE950021BE6D /* release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; @@ -2551,7 +2593,6 @@ A9A5CD9B1E32072F00947914 /* debug-sandbox */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; @@ -2798,7 +2839,6 @@ A9A5CDA11E32073800947914 /* release-sandbox */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; diff --git a/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index a3f43a8b3..08de0be8d 100644 --- a/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>BuildSystemType</key> - <string>Original</string> <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key> <false/> </dict> |