diff options
| author | Damiano Galassi <[email protected]> | 2018-10-20 12:15:50 +0200 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2018-10-20 12:15:50 +0200 |
| commit | 70f1438bd17a9eea7e18db17d0bbc5b1ec11ac93 (patch) | |
| tree | 0e2943b40345e0b6df30a764841358d8e27a1773 /macosx | |
| parent | 051964b666129d4c30fa901f0ecbfa8eb5c0156b (diff) | |
build: revert to the legacy Xcode build system until until we found a way to make it work when called from make. Remove fontconfig from the Xcode project.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 3 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index a17d087aa..858951e7c 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -412,7 +412,6 @@ 27D6C72C14B102DA00B785E4 /* libbluray.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbluray.a; path = external/contrib/lib/libbluray.a; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C72E14B102DA00B785E4 /* libdvdnav.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdnav.a; path = external/contrib/lib/libdvdnav.a; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C72F14B102DA00B785E4 /* libdvdread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdread.a; path = external/contrib/lib/libdvdread.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 27D6C73114B102DA00B785E4 /* libfontconfig.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfontconfig.a; path = external/contrib/lib/libfontconfig.a; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C73214B102DA00B785E4 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = external/contrib/lib/libfreetype.a; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C73314B102DA00B785E4 /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = external/contrib/lib/libfribidi.a; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C73614B102DA00B785E4 /* libmp3lame.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp3lame.a; path = external/contrib/lib/libmp3lame.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -788,7 +787,6 @@ 27D6C72C14B102DA00B785E4 /* libbluray.a */, 27D6C72E14B102DA00B785E4 /* libdvdnav.a */, 27D6C72F14B102DA00B785E4 /* libdvdread.a */, - 27D6C73114B102DA00B785E4 /* libfontconfig.a */, 27D6C73214B102DA00B785E4 /* libfreetype.a */, 27D6C73314B102DA00B785E4 /* libfribidi.a */, 27D6C73614B102DA00B785E4 /* libmp3lame.a */, @@ -1622,6 +1620,7 @@ outputPaths = ( "\"$(EXTERNAL_BUILD)/libhb/hb_dict.h\"", "\"$(EXTERNAL_BUILD)/libhb/hb.h\"", + "\"$(EXTERNAL_BUILD)/macosx/Info.plist\"", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 08de0be8d..a3f43a8b3 100644 --- a/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -2,6 +2,8 @@ <!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> |