Index: webkit/SConscript.port |
=================================================================== |
--- webkit/SConscript.port (revision 1735) |
+++ webkit/SConscript.port (working copy) |
@@ -22,30 +22,36 @@ |
'$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 @@ |
] |
env.ChromeStaticLibrary("port", input_files) |
- |