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 | |
| 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')
| -rw-r--r-- | webkit/SConscript.port | 49 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 16 |
2 files changed, 38 insertions, 27 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)
-
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 888a9b1..ae26a5f 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -116,7 +116,6 @@ inputs = [ '$DERIVED_DIR/V8SVGNumber.cpp', '$DERIVED_DIR/V8SVGMetadataElement.cpp', '$DERIVED_DIR/V8SVGMatrix.cpp', - '$DERIVED_DIR/V8SVGMaskElement.cpp', '$DERIVED_DIR/V8SVGMarkerElement.cpp', '$DERIVED_DIR/V8SVGLineElement.cpp', '$DERIVED_DIR/V8SVGLinearGradientElement.cpp', @@ -140,7 +139,6 @@ inputs = [ '$DERIVED_DIR/V8SVGDescElement.cpp', '$DERIVED_DIR/V8SVGDefsElement.cpp', '$DERIVED_DIR/V8SVGDefinitionSrcElement.cpp', - '$DERIVED_DIR/V8SVGCursorElement.cpp', '$DERIVED_DIR/V8SVGColor.cpp', '$DERIVED_DIR/V8SVGClipPathElement.cpp', '$DERIVED_DIR/V8SVGCircleElement.cpp', @@ -276,14 +274,23 @@ inputs = [ '$DERIVED_DIR/V8Attr.cpp', '$DERIVED_DIR/UserAgentStyleSheetsData.cpp', '$DERIVED_DIR/SVGNames.cpp', - '$DERIVED_DIR/SVGElementFactory.cpp', '$DERIVED_DIR/HTMLNames.cpp', ] +# TODO(erg): These are temporarily disabled during the merge of code back to +# WebKit. As soon as we're back on TOT, these go back into the working files +# section. +if env['PLATFORM'] == 'win32': + inputs += [ + '$DERIVED_DIR/SVGElementFactory.cpp', + '$DERIVED_DIR/V8SVGCursorElement.cpp', + '$DERIVED_DIR/V8SVGMaskElement.cpp', + ] + # TODO(erg): Get Frame.h ported and half of this should compile. Get whatever # String.h is referenced below and the other half should compile if env['PLATFORM'] == 'win32': - inputs = [ + inputs += [ '$DERIVED_DIR/V8Clipboard.cpp', '$DERIVED_DIR/V8DOMWindow.cpp', '$DERIVED_DIR/V8HTMLInputElement.cpp', @@ -316,4 +323,3 @@ if env['PLATFORM'] == 'win32': ] env.ChromeStaticLibrary('V8Bindings', inputs) - |