diff options
| -rw-r--r-- | build/all.xcodeproj/project.pbxproj | 13 | ||||
| -rw-r--r-- | webkit/build/webkit_staticlib.xcconfig | 12 | ||||
| -rw-r--r-- | webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 6 |
4 files changed, 17 insertions, 18 deletions
diff --git a/build/all.xcodeproj/project.pbxproj b/build/all.xcodeproj/project.pbxproj index 5c9d377..a439eb9 100644 --- a/build/all.xcodeproj/project.pbxproj +++ b/build/all.xcodeproj/project.pbxproj @@ -45,6 +45,7 @@ 7BF8964E0E75D705000BAF8A /* PBXTargetDependency */, 4D7B02320E9D57E4009A6919 /* PBXTargetDependency */, 7BF895DE0E75D5FB000BAF8A /* PBXTargetDependency */, + 4DB68A420EAFF13D00AB2128 /* PBXTargetDependency */, 4DB681B50EAF948E00AB2128 /* PBXTargetDependency */, 4DB681B70EAF948E00AB2128 /* PBXTargetDependency */, 4DB681B90EAF948E00AB2128 /* PBXTargetDependency */, @@ -170,6 +171,13 @@ remoteGlobalIDString = 4DB684920EAFDF7000AB2128; remoteInfo = xslt; }; + 4DB68A410EAFF13D00AB2128 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7BF895BB0E75D5E5000BAF8A /* webkit.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = E45626A20E268F03005E4685; + remoteInfo = glue; + }; 7B262E390E82E508001CE27F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7BF895A30E75D5DA000BAF8A /* v8.xcodeproj */; @@ -1333,6 +1341,11 @@ name = xslt; targetProxy = 4DB686780EAFE61A00AB2128 /* PBXContainerItemProxy */; }; + 4DB68A420EAFF13D00AB2128 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = glue; + targetProxy = 4DB68A410EAFF13D00AB2128 /* PBXContainerItemProxy */; + }; 7B2630020E82F19B001CE27F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = libevent; diff --git a/webkit/build/webkit_staticlib.xcconfig b/webkit/build/webkit_staticlib.xcconfig deleted file mode 100644 index e74a6a4..0000000 --- a/webkit/build/webkit_staticlib.xcconfig +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "../build/staticlib.xcconfig" - -// We need to compile everything in this target as objective-C++ in order to -// avoid linker issues with parameters declared sometimes as |void*| (from C++) -// and other times as |id| (from Objective-C). However, we can't set this -// globally because some things (such as icu or other 3rd-party libraries) can't -// build this way. -GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj index 171ffc7..f47bb9e 100644 --- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj +++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj @@ -94,14 +94,14 @@ isa = PBXContainerItemProxy; containerPortal = 4DB687CA0EAFE79200AB2128 /* libxslt.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 4DB684930EAFDF7000AB2128 /* libxslt.a */; + remoteGlobalIDString = 4DB684930EAFDF7000AB2128; remoteInfo = xslt; }; 4DB687D50EAFE7B100AB2128 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4DB687CA0EAFE79200AB2128 /* libxslt.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 4DB684920EAFDF7000AB2128 /* xslt */; + remoteGlobalIDString = 4DB684920EAFDF7000AB2128; remoteInfo = xslt; }; 4DB7FE750E9BF6CB00C66CE0 /* PBXContainerItemProxy */ = { diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 92f7b29..674e94c 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -3943,7 +3943,6 @@ E4E4C8530E7832DC009A687C /* PlatformContextSkia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformContextSkia.cpp; sourceTree = "<group>"; }; E4E4C88E0E783E49009A687C /* SkGraphicsContextMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkGraphicsContextMac.cpp; sourceTree = "<group>"; }; E4E4CA190E80208A009A687C /* FontCacheMacPending.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontCacheMacPending.cpp; path = mac/FontCacheMacPending.cpp; sourceTree = "<group>"; }; - E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = webkit_staticlib.xcconfig; path = build/webkit_staticlib.xcconfig; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -6274,7 +6273,6 @@ 7BF8842E0E71C120000BAF8A /* executable.xcconfig */, 7BF8842F0E71C120000BAF8A /* release.xcconfig */, 7BF884300E71C120000BAF8A /* staticlib.xcconfig */, - E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */, ); name = Configuration; path = ../build; @@ -9254,7 +9252,7 @@ }; E45627130E268F03005E4685 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */; + baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */; buildSettings = { GCC_PREFIX_HEADER = ../third_party/WebKit/WebCore/WebCorePrefix.h; HEADER_SEARCH_PATHS = ( @@ -9272,7 +9270,7 @@ }; E45627140E268F03005E4685 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */; + baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */; buildSettings = { GCC_PREFIX_HEADER = ../third_party/WebKit/WebCore/WebCorePrefix.h; HEADER_SEARCH_PATHS = ( |