diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 21:48:54 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 21:48:54 +0000 |
| commit | c5171bad7aaef9934036ca6f3a2ff4b7acda6562 (patch) | |
| tree | ddbf0e888ce72ff0958575ef43cc3317cd243bf8 /webkit/SConscript.port | |
| parent | 3112de422e881a3f7770c55778605bb5aedd1ca9 (diff) | |
| download | chromium_src-c5171bad7aaef9934036ca6f3a2ff4b7acda6562.zip chromium_src-c5171bad7aaef9934036ca6f3a2ff4b7acda6562.tar.gz chromium_src-c5171bad7aaef9934036ca6f3a2ff4b7acda6562.tar.bz2 | |
Fix the build under Linux; there were recent changes to
webkit which meant we needed to disable some files
temporarily.
Review URL: http://codereview.chromium.org/447
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript.port')
| -rw-r--r-- | webkit/SConscript.port | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 033dce06..ebf1034 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -22,30 +22,36 @@ input_files = [ '$PORT_DIR/css/RGBColor.cpp',
'$PORT_DIR/history/CachedPage.cpp',
'$PORT_DIR/platform/TemporaryLinkStubs.cpp',
- '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
- '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
- '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
- '$PORT_DIR/platform/graphics/PathSkia.cpp',
- '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
- '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
- '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
- '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
- '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
]
if env['PLATFORM'] == 'win32':
+ # TODO(erg): Temporarily disabling these until the big webkit merge is
+ # complete; we're just out of date here.
+ input_files += [
+ '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
+ '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
+ '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
+ '$PORT_DIR/platform/graphics/PathSkia.cpp',
+ '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
+ '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
+ '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
+ '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
+ '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
+ '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+ ]
+
+if env['PLATFORM'] == 'win32':
# These files aren't win32-specific, they're just files that haven't yet been
# made portable.
input_files = [
@@ -119,4 +125,3 @@ if env['PLATFORM'] == 'win32': ]
env.ChromeStaticLibrary("port", input_files)
-
|