summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 14:18:41 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 14:18:41 +0000
commitdef7fce451d9f70ffa602d6e38524cb8ecc8adfa (patch)
treeb29121993862cd71dda6dfcdcebb47ac48a3a163 /webkit/build
parent2fb5bbd13a4599e024028bf16e35e49de119e80a (diff)
downloadchromium_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/build')
-rw-r--r--webkit/build/webkit_staticlib.xcconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/webkit/build/webkit_staticlib.xcconfig b/webkit/build/webkit_staticlib.xcconfig
new file mode 100644
index 0000000..e74a6a4
--- /dev/null
+++ b/webkit/build/webkit_staticlib.xcconfig
@@ -0,0 +1,12 @@
+// 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