diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/WebCore.gyp | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/WebCore.gyp')
| -rw-r--r-- | Source/WebCore/WebCore.gyp/WebCore.gyp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp index 34066f7..f96753c 100644 --- a/Source/WebCore/WebCore.gyp/WebCore.gyp +++ b/Source/WebCore/WebCore.gyp/WebCore.gyp @@ -185,6 +185,7 @@ '../svg/graphics', '../svg/graphics/filters', '../svg/properties', + '../thirdparty/glu', '../webaudio', '../websockets', '../workers', @@ -1117,6 +1118,8 @@ # Use LinkHashChromium.cpp instead ['exclude', 'platform/LinkHash\\.cpp$'], + + ['include', 'thirdparty/glu/libtess/'], ], 'conditions': [ ['OS=="linux" or OS=="freebsd"', { @@ -1133,6 +1136,10 @@ '<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz', ], }], + ['OS=="linux" and target_arch=="arm"', { + # Due to a bug in gcc arm, we get warnings about uninitialized timesNewRoman.unstatic.3258 + 'cflags': ['-Wno-uninitialized'], + }], ['OS=="mac"', { # Necessary for Mac .mm stuff. 'include_dirs': [ @@ -1173,9 +1180,7 @@ ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'], ['include', 'platform/graphics/mac/ComplexText[^/]*\\.(cpp|h)$'], - # AudioBusMac is necessary for web audio API bringup on Chrome. - # It will later be replaced with chromium-specific code. - ['include', 'platform/audio/mac/AudioBusMac\\.mm$'], + # We can use this for the fast Accelerate.framework FFT. ['include', 'platform/audio/mac/FFTFrameMac\\.cpp$'], # Cherry-pick some files that can't be included by broader regexps. |