From ae7fc02b600aca283a032ab916a270aa944c4d89 Mon Sep 17 00:00:00 2001 From: "ddkilzer@apple.com" Date: Sun, 12 Jan 2014 05:59:44 +0000 Subject: [PATCH] [iOS] Do not link to ApplicationServices.framework for iOS Reviewed by Dan Bernstein. * Configurations/WebCore.xcconfig: (OTHER_LDFLAGS_macosx): Add -framework ApplicationServices. * WebCore.xcodeproj/project.pbxproj: Remove reference to ApplicationServices.framework. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161800 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 12 ++++++++++++ Source/WebCore/Configurations/WebCore.xcconfig | 2 +- Source/WebCore/WebCore.xcodeproj/project.pbxproj | 4 ---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index f97dd24f6c7a..0d3d97dc55b1 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2014-01-11 David Kilzer + + [iOS] Do not link to ApplicationServices.framework for iOS + + + Reviewed by Dan Bernstein. + + * Configurations/WebCore.xcconfig: + (OTHER_LDFLAGS_macosx): Add -framework ApplicationServices. + * WebCore.xcodeproj/project.pbxproj: Remove reference to + ApplicationServices.framework. + 2014-01-11 David Kilzer [iOS] Build fix for StyleResolver.cpp diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig index 39cad2bcd2b0..fd95be38d703 100644 --- a/Source/WebCore/Configurations/WebCore.xcconfig +++ b/Source/WebCore/Configurations/WebCore.xcconfig @@ -73,7 +73,7 @@ OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSuppo OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME)); OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface; OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework Accelerate -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework QuartzCore -lMobileGestalt; -OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebKit2 -framework IOSurface; +OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebKit2 -framework ApplicationServices -framework IOSurface; NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME)); NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR); diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index ac5449efff16..6527c3defa55 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -3231,7 +3231,6 @@ 93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24B06D18A7E004A6FA3 /* XSLTProcessor.cpp */; }; 93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24D06D18A7E004A6FA3 /* XSLTProcessorLibxslt.cpp */; }; 93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8560510701F91100239769 /* WebCoreView.m */; }; - 93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2869302846DCD018635CA /* ApplicationServices.framework */; }; 93F19B1408245E59001E9ABC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2869402846DCD018635CA /* Carbon.framework */; }; 93F19B1508245E59001E9ABC /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2869502846DCD018635CA /* Cocoa.framework */; }; 93F19B1608245E59001E9ABC /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8216299029F4FB501000131 /* JavaScriptCore.framework */; }; @@ -13517,7 +13516,6 @@ F5C041E00FFCA96D00839D4A /* DOMHTMLDataListElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLDataListElementInternal.h; sourceTree = ""; }; F5C041E10FFCA96D00839D4A /* JSHTMLDataListElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDataListElement.cpp; sourceTree = ""; }; F5C041E20FFCA96D00839D4A /* JSHTMLDataListElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLDataListElement.h; sourceTree = ""; }; - F5C2869302846DCD018635CA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; F5C2869402846DCD018635CA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; F5C2869502846DCD018635CA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; F5E0C6591643C42C00D6CB69 /* BaseChooserOnlyDateAndTimeInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseChooserOnlyDateAndTimeInputType.cpp; sourceTree = ""; }; @@ -13943,7 +13941,6 @@ files = ( 5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */, FD2DBF1212B048A300ED98C6 /* Accelerate.framework in Frameworks */, - 93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */, FD2DBF1312B048A300ED98C6 /* AudioToolbox.framework in Frameworks */, FD2DBF1412B048A300ED98C6 /* AudioUnit.framework in Frameworks */, 93F19B1408245E59001E9ABC /* Carbon.framework in Frameworks */, @@ -14349,7 +14346,6 @@ isa = PBXGroup; children = ( FD2DBF0E12B048A300ED98C6 /* Accelerate.framework */, - F5C2869302846DCD018635CA /* ApplicationServices.framework */, FD2DBF0F12B048A300ED98C6 /* AudioToolbox.framework */, FD2DBF1012B048A300ED98C6 /* AudioUnit.framework */, F5C2869402846DCD018635CA /* Carbon.framework */, -- 2.30.1