diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 14:18:41 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 14:18:41 +0000 |
| commit | def7fce451d9f70ffa602d6e38524cb8ecc8adfa (patch) | |
| tree | b29121993862cd71dda6dfcdcebb47ac48a3a163 /webkit/webkit.xcodeproj | |
| parent | 2fb5bbd13a4599e024028bf16e35e49de119e80a (diff) | |
| download | chromium_src-def7fce451d9f70ffa602d6e38524cb8ecc8adfa.zip chromium_src-def7fce451d9f70ffa602d6e38524cb8ecc8adfa.tar.gz chromium_src-def7fce451d9f70ffa602d6e38524cb8ecc8adfa.tar.bz2 | |
add a new xcconfig to build c++ files as obj-c++ to ensure correct linkage. Be more specific when using an overloaded operator since objective-c++ finds conflicts. Enable objective-C GC in our common config file for all projects.
Review URL: http://codereview.chromium.org/2912
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.xcodeproj')
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 53d59d9..f862155 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -3705,6 +3705,7 @@ 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>"; }; E4E4CA900E803BB9009A687C /* AXObjectCacheMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AXObjectCacheMac.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 */ @@ -5943,6 +5944,7 @@ 7BF8842E0E71C120000BAF8A /* executable.xcconfig */, 7BF8842F0E71C120000BAF8A /* release.xcconfig */, 7BF884300E71C120000BAF8A /* staticlib.xcconfig */, + E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */, ); name = Configuration; path = ../build; @@ -8616,7 +8618,7 @@ }; E45627130E268F03005E4685 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */; + baseConfigurationReference = E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */; buildSettings = { GCC_PREFIX_HEADER = ../third_party/WebKit/WebCore/WebCorePrefix.h; HEADER_SEARCH_PATHS = ( @@ -8633,7 +8635,7 @@ }; E45627140E268F03005E4685 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */; + baseConfigurationReference = E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */; buildSettings = { GCC_PREFIX_HEADER = ../third_party/WebKit/WebCore/WebCorePrefix.h; HEADER_SEARCH_PATHS = ( |