| OLD | NEW | 
|---|
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 Import('env') | 5 Import('env') | 
| 6 | 6 | 
| 7 env = env.Clone() | 7 env = env.Clone() | 
| 8 | 8 | 
| 9 env.Prepend( | 9 env.Prepend( | 
| 10   CPPPATH = [ | 10   CPPPATH = [ | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32       '/wd4267', | 32       '/wd4267', | 
| 33       '/wd4345', | 33       '/wd4345', | 
| 34       '/wd4390', | 34       '/wd4390', | 
| 35       '/wd4554', | 35       '/wd4554', | 
| 36       '/wd4800', | 36       '/wd4800', | 
| 37     ], | 37     ], | 
| 38   ) | 38   ) | 
| 39 elif env.Bit('posix'): | 39 elif env.Bit('posix'): | 
| 40   env.Append(CCFLAGS = ['-Wno-unused']) | 40   env.Append(CCFLAGS = ['-Wno-unused']) | 
| 41 | 41 | 
| 42 input_files = [ | 42 input_files = ChromeFileList([ | 
| 43   'animator/SkTime.cpp', | 43   # TODO(sgk): | 
| 44   'corecg/Sk64.cpp', | 44   # We're deliberately mis-indenting the MSVSFilter() calls here | 
| 45   'corecg/SkBuffer.cpp', | 45   # so we don't have to re-indent the file name entries when the | 
| 46   'corecg/SkChunkAlloc.cpp', | 46   # MSVSFilter() calls go away in (favor of automated generation | 
| 47   'corecg/SkCordic.cpp', | 47   # of the heirarchy). | 
| 48   'corecg/SkDebug.cpp', | 48   MSVSFilter('Header files', [ | 
| 49   'corecg/SkDebug_stdio.cpp', | 49     'include/Sk1DPathEffect.h', | 
| 50   'corecg/SkFloat.cpp', | 50     'include/Sk2DPathEffect.h', | 
| 51   'corecg/SkFloatBits.cpp', | 51     'include/corecg/Sk64.h', | 
| 52   'corecg/SkInterpolator.cpp', | 52     'include/SkAnimator.h', | 
| 53   'corecg/SkMath.cpp', | 53     'include/SkAnimatorView.h', | 
| 54   'corecg/SkMatrix.cpp', | 54     'include/SkApplication.h', | 
| 55   'corecg/SkMemory_stdlib.cpp', | 55     'include/SkAvoidXfermode.h', | 
| 56   'corecg/SkPageFlipper.cpp', | 56     'include/SkBGViewArtist.h', | 
| 57   'corecg/SkPoint.cpp', | 57     'include/SkBitmap.h', | 
| 58   'corecg/SkRect.cpp', | 58     'include/SkBlurDrawLooper.h', | 
| 59   'corecg/SkRegion.cpp', | 59     'include/SkBlurMaskFilter.h', | 
| 60   'effects/Sk1DPathEffect.cpp', | 60     'include/SkBML_WXMLParser.h', | 
| 61   'effects/Sk2DPathEffect.cpp', | 61     'include/SkBML_XMLParser.h', | 
| 62   'effects/SkAvoidXfermode.cpp', | 62     'include/SkBorderView.h', | 
| 63   'effects/SkBlurDrawLooper.cpp', | 63     'include/SkBounder.h', | 
| 64   'effects/SkBlurMask.cpp', | 64     'include/corecg/SkBuffer.h', | 
| 65   'effects/SkBlurMaskFilter.cpp', | 65     'include/SkCamera.h', | 
| 66   'effects/SkCamera.cpp', | 66     'include/SkCanvas.h', | 
| 67   'effects/SkColorFilters.cpp', | 67     'include/corecg/SkChunkAlloc.h', | 
| 68   'effects/SkColorMatrix.cpp', | 68     'include/SkColor.h', | 
| 69   'effects/SkColorMatrixFilter.cpp', | 69     'include/SkColorFilter.h', | 
| 70   'effects/SkCornerPathEffect.cpp', | 70     'include/SkColorMatrix.h', | 
| 71   'effects/SkCullPoints.cpp', | 71     'include/SkColorPriv.h', | 
| 72   'effects/SkDashPathEffect.cpp', | 72     'include/SkColorShader.h', | 
| 73   'effects/SkDiscretePathEffect.cpp', | 73     'include/SkCornerPathEffect.h', | 
| 74   'effects/SkEmbossMask.cpp', | 74     'include/SkCullPoints.h', | 
| 75   'effects/SkEmbossMaskFilter.cpp', | 75     'include/SkDashPathEffect.h', | 
| 76   'effects/SkGradientShader.cpp', | 76     'include/SkDeque.h', | 
| 77   'effects/SkKernel33MaskFilter.cpp', | 77     'include/SkDescriptor.h', | 
| 78   'effects/SkLayerRasterizer.cpp', | 78     'include/SkDevice.h', | 
| 79   'effects/SkPaintFlagsDrawFilter.cpp', | 79     'include/SkDiscretePathEffect.h', | 
| 80   'effects/SkPixelXorXfermode.cpp', | 80     'include/SkDither.h', | 
| 81   'effects/SkShaderExtras.cpp', | 81     'include/SkDOM.h', | 
| 82   'effects/SkTransparentShader.cpp', | 82     'include/SkDraw.h', | 
| 83   'effects/SkUnitMappers.cpp', | 83     'include/SkDrawExtraPathEffect.h', | 
| 84   'ext/image_operations.cc', | 84     'include/SkDrawFilter.h', | 
| 85   'ext/convolver.cc', | 85     'include/SkDrawLooper.h', | 
| 86   'ext/skia_utils.cc', | 86     'include/SkEmbossMaskFilter.h', | 
| 87   'images/SkImageDecoder.cpp', | 87     'include/corecg/SkEndian.h', | 
| 88   'images/SkImageRef.cpp', | 88     'include/SkEvent.h', | 
| 89   'images/SkStream.cpp', | 89     'include/SkEventSink.h', | 
| 90   'picture/SkPathHeap.cpp', | 90     'include/corecg/SkFDot6.h', | 
| 91   'picture/SkPicture.cpp', | 91     'include/corecg/SkFixed.h', | 
| 92   'picture/SkPictureFlat.cpp', | 92     'include/SkFlattenable.h', | 
| 93   'picture/SkPicturePlayback.cpp', | 93     'include/SkFlipPixelRef.h', | 
| 94   'picture/SkPictureRecord.cpp', | 94     'include/corecg/SkFloatBits.h', | 
| 95   'ports/SkFontHost_none.cpp', | 95     'include/corecg/SkFloatingPoint.h', | 
| 96   'ports/SkGlobals_global.cpp', | 96     'include/SkFontCodec.h', | 
| 97   'ports/SkImageDecoder_Factory.cpp', | 97     'include/SkFontHost.h', | 
| 98   'ports/SkOSFile_stdio.cpp', | 98     'include/SkGlobals.h', | 
| 99   'sgl/SkAlphaRuns.cpp', | 99     'include/SkGradientShader.h', | 
| 100   'sgl/SkBitmap.cpp', | 100     'include/SkGraphics.h', | 
| 101   'sgl/SkBitmapProcShader.cpp', | 101     'include/SkImageDecoder.h', | 
| 102   'sgl/SkBitmapProcState.cpp', | 102     'include/SkImageRef.h', | 
| 103   'sgl/SkBitmapProcState_matrixProcs.cpp', | 103     'include/SkImageView.h', | 
| 104   'sgl/SkBitmapSampler.cpp', | 104     'include/corecg/SkInterpolator.h', | 
| 105   'sgl/SkBitmapShader.cpp', | 105     'include/SkJS.h', | 
| 106   'sgl/SkBlitRow_D16.cpp', | 106     'include/SkKernel33MaskFilter.h', | 
| 107   'sgl/SkBlitRow_D4444.cpp', | 107     'include/SkKey.h', | 
| 108   'sgl/SkBlitter.cpp', | 108     'include/SkLayerDrawLooper.h', | 
| 109   'sgl/SkBlitter_4444.cpp', | 109     'include/SkLayerRasterizer.h', | 
| 110   'sgl/SkBlitter_A1.cpp', | 110     'include/SkMallocPixelRef.h', | 
| 111   'sgl/SkBlitter_A8.cpp', | 111     'include/SkMask.h', | 
| 112   'sgl/SkBlitter_ARGB32.cpp', | 112     'include/SkMaskFilter.h', | 
| 113   'sgl/SkBlitter_RGB16.cpp', | 113     'include/corecg/SkMath.h', | 
| 114   'sgl/SkBlitter_Sprite.cpp', | 114     'include/corecg/SkMatrix.h', | 
| 115   'sgl/SkCanvas.cpp', | 115     'include/SkMetaData.h', | 
| 116   'sgl/SkColor.cpp', | 116     'include/SkMMapStream.h', | 
| 117   'sgl/SkColorFilter.cpp', | 117     'include/SkMovie.h', | 
| 118   'sgl/SkColorTable.cpp', | 118     'include/SkNinePatch.h', | 
| 119   'sgl/SkDeque.cpp', | 119     'include/SkOSFile.h', | 
| 120   'sgl/SkDevice.cpp', | 120     'include/SkOSMenu.h', | 
| 121   'sgl/SkDither.cpp', | 121     'include/SkOSSound.h', | 
| 122   'sgl/SkDraw.cpp', | 122     'include/SkOSWindow_Mac.h', | 
| 123   'sgl/SkEdge.cpp', | 123     'include/SkOSWindow_Unix.h', | 
| 124   'sgl/SkFilterProc.cpp', | 124     'include/SkOSWindow_Win.h', | 
| 125   'sgl/SkFlattenable.cpp', | 125     'include/SkOSWindow_wxwidgets.h', | 
| 126   'sgl/SkGeometry.cpp', | 126     'include/SkPackBits.h', | 
| 127   'sgl/SkGlobals.cpp', | 127     'include/corecg/SkPageFlipper.h', | 
| 128   'sgl/SkGlyphCache.cpp', | 128     'include/SkPaint.h', | 
| 129   'sgl/SkGraphics.cpp', | 129     'include/SkPaintFlagsDrawFilter.h', | 
| 130   'sgl/SkMask.cpp', | 130     'include/SkParse.h', | 
| 131   'sgl/SkMaskFilter.cpp', | 131     'include/SkParsePaint.h', | 
| 132   'sgl/SkPackBits.cpp', | 132     'include/SkPath.h', | 
| 133   'sgl/SkPaint.cpp', | 133     'include/SkPathEffect.h', | 
| 134   'sgl/SkPath.cpp', | 134     'include/SkPathMeasure.h', | 
| 135   'sgl/SkPathEffect.cpp', | 135     'include/corecg/SkPerspIter.h', | 
| 136   'sgl/SkPathMeasure.cpp', | 136     'include/SkPicture.h', | 
| 137   'sgl/SkPixelRef.cpp', | 137     'include/SkPixelRef.h', | 
| 138   'sgl/SkProcSpriteBlitter.cpp', | 138     'include/SkPixelXorXfermode.h', | 
| 139   'sgl/SkPtrRecorder.cpp', | 139     'include/corecg/SkPoint.h', | 
| 140   'sgl/SkRasterizer.cpp', | 140     'include/SkPorterDuff.h', | 
| 141   'sgl/SkRefCnt.cpp', | 141     'include/corecg/SkPostConfig.h', | 
| 142   'sgl/SkRegion_path.cpp', | 142     'include/corecg/SkPreConfig.h', | 
| 143   'sgl/SkScalerContext.cpp', | 143     'include/SkProgressBarView.h', | 
| 144   'sgl/SkScan.cpp', | 144     'include/SkPtrRecorder.h', | 
| 145   'sgl/SkScan_Antihair.cpp', | 145     'include/corecg/SkRandom.h', | 
| 146   'sgl/SkScan_AntiPath.cpp', | 146     'include/SkRasterizer.h', | 
| 147   'sgl/SkScan_Hairline.cpp', | 147     'include/SkReader32.h', | 
| 148   'sgl/SkScan_Path.cpp', | 148     'include/corecg/SkRect.h', | 
| 149   'sgl/SkShader.cpp', | 149     'include/SkRefCnt.h', | 
| 150   'sgl/SkSpriteBlitter_ARGB32.cpp', | 150     'include/corecg/SkRegion.h', | 
| 151   'sgl/SkSpriteBlitter_RGB16.cpp', | 151     'include/corecg/SkScalar.h', | 
| 152   'sgl/SkString.cpp', | 152     'include/corecg/SkScalarCompare.h', | 
| 153   'sgl/SkStroke.cpp', | 153     'include/SkScalerContext.h', | 
| 154   'sgl/SkStrokerPriv.cpp', | 154     'include/SkScrollBarView.h', | 
| 155   'sgl/SkTSearch.cpp', | 155     'include/SkShader.h', | 
| 156   'sgl/SkTypeface_fake.cpp', | 156     'include/SkShaderExtras.h', | 
| 157   'sgl/SkUtils.cpp', | 157     'include/SkStackViewLayout.h', | 
| 158   'sgl/SkWriter32.cpp', | 158     'include/SkStream.h', | 
| 159   'sgl/SkXfermode.cpp', | 159     'include/SkStream_Win.h', | 
| 160 ] | 160     'include/SkString.h', | 
|  | 161     'include/SkStroke.h', | 
|  | 162     'include/SkSVGAttribute.h', | 
|  | 163     'include/SkSVGBase.h', | 
|  | 164     'include/SkSVGPaintState.h', | 
|  | 165     'include/SkSVGParser.h', | 
|  | 166     'include/SkSVGTypes.h', | 
|  | 167     'include/SkSystemEventTypes.h', | 
|  | 168     'include/SkTDArray.h', | 
|  | 169     'include/SkTDict.h', | 
|  | 170     'include/SkTDStack.h', | 
|  | 171     'include/corecg/SkTemplates.h', | 
|  | 172     'include/SkTextBox.h', | 
|  | 173     'include/corecg/SkThread.h', | 
|  | 174     'include/corecg/SkThread_platform.h', | 
|  | 175     'include/SkTime.h', | 
|  | 176     'include/SkTransparentShader.h', | 
|  | 177     'include/corecg/SkTSearch.h', | 
|  | 178     'include/SkTypeface.h', | 
|  | 179     'include/corecg/SkTypes.h', | 
|  | 180     'include/SkUnitMapper.h', | 
|  | 181     'include/SkUnitMappers.h', | 
|  | 182     'include/SkUnPreMultiply.h', | 
|  | 183     'include/corecg/SkUserConfig.h', | 
|  | 184     'include/SkUtils.h', | 
|  | 185     'include/SkView.h', | 
|  | 186     'include/SkViewInflate.h', | 
|  | 187     'include/SkWidget.h', | 
|  | 188     'include/SkWidgetViews.h', | 
|  | 189     'include/SkWindow.h', | 
|  | 190     'include/SkWriter32.h', | 
|  | 191     'include/SkXfermode.h', | 
|  | 192     'include/SkXMLParser.h', | 
|  | 193     'include/SkXMLWriter.h', | 
|  | 194   ]), | 
|  | 195 | 
|  | 196   MSVSFilter('corecg', [ | 
|  | 197     'corecg/Sk64.cpp', | 
|  | 198     'corecg/SkBuffer.cpp', | 
|  | 199     'corecg/SkChunkAlloc.cpp', | 
|  | 200     'corecg/SkCordic.cpp', | 
|  | 201     'corecg/SkCordic.h', | 
|  | 202     'corecg/SkDebug.cpp', | 
|  | 203     'corecg/SkDebug_stdio.cpp', | 
|  | 204     'corecg/SkFloat.cpp', | 
|  | 205     'corecg/SkFloat.h', | 
|  | 206     'corecg/SkFloatBits.cpp', | 
|  | 207     'corecg/SkInterpolator.cpp', | 
|  | 208     'corecg/SkMath.cpp', | 
|  | 209     'corecg/SkMatrix.cpp', | 
|  | 210     'corecg/SkMemory_stdlib.cpp', | 
|  | 211     'corecg/SkPageFlipper.cpp', | 
|  | 212     'corecg/SkPoint.cpp', | 
|  | 213     'corecg/SkRect.cpp', | 
|  | 214     'corecg/SkRegion.cpp', | 
|  | 215     'corecg/SkRegionPriv.h', | 
|  | 216     'corecg/SkSinTable.h', | 
|  | 217     'corecg/SkTSort.h', | 
|  | 218   ]), | 
|  | 219 | 
|  | 220   MSVSFilter('sgl', [ | 
|  | 221     'sgl/SkAlphaRuns.cpp', | 
|  | 222     'sgl/SkAntiRun.h', | 
|  | 223     'sgl/SkAutoKern.h', | 
|  | 224     'sgl/SkBitmap.cpp', | 
|  | 225     'sgl/SkBitmapProcShader.cpp', | 
|  | 226     'sgl/SkBitmapProcShader.h', | 
|  | 227     'sgl/SkBitmapProcState.cpp', | 
|  | 228     'sgl/SkBitmapProcState.h', | 
|  | 229     'sgl/SkBitmapProcState_matrix.h', | 
|  | 230     'sgl/SkBitmapProcState_matrixProcs.cpp', | 
|  | 231     'sgl/SkBitmapSampler.cpp', | 
|  | 232     'sgl/SkBitmapSampler.h', | 
|  | 233     'sgl/SkBitmapSamplerTemplate.h', | 
|  | 234     'sgl/SkBitmapShader.cpp', | 
|  | 235     'sgl/SkBitmapShader.h', | 
|  | 236     'sgl/SkBitmapShader16BilerpTemplate.h', | 
|  | 237     'sgl/SkBitmapShaderTemplate.h', | 
|  | 238     'sgl/SkBlitBWMaskTemplate.h', | 
|  | 239     'sgl/SkBlitRow.h', | 
|  | 240     'sgl/SkBlitRow_D16.cpp', | 
|  | 241     'sgl/SkBlitRow_D4444.cpp', | 
|  | 242     'sgl/SkBlitter.cpp', | 
|  | 243     'sgl/SkBlitter.h', | 
|  | 244     'sgl/SkBlitter_4444.cpp', | 
|  | 245     'sgl/SkBlitter_A1.cpp', | 
|  | 246     'sgl/SkBlitter_A8.cpp', | 
|  | 247     'sgl/SkBlitter_ARGB32.cpp', | 
|  | 248     'sgl/SkBlitter_RGB16.cpp', | 
|  | 249     'sgl/SkBlitter_Sprite.cpp', | 
|  | 250     'sgl/SkCanvas.cpp', | 
|  | 251     'sgl/SkColor.cpp', | 
|  | 252     'sgl/SkColorFilter.cpp', | 
|  | 253     'sgl/SkColorTable.cpp', | 
|  | 254     'sgl/SkCoreBlitters.h', | 
|  | 255     'sgl/SkDeque.cpp', | 
|  | 256     'sgl/SkDevice.cpp', | 
|  | 257     'sgl/SkDither.cpp', | 
|  | 258     'sgl/SkDraw.cpp', | 
|  | 259     'sgl/SkDraw.h', | 
|  | 260     'sgl/SkEdge.cpp', | 
|  | 261     'sgl/SkEdge.h', | 
|  | 262     'sgl/SkFilterProc.cpp', | 
|  | 263     'sgl/SkFilterProc.h', | 
|  | 264     'sgl/SkFlattenable.cpp', | 
|  | 265     'sgl/SkFP.h', | 
|  | 266     'sgl/SkGeometry.cpp', | 
|  | 267     'sgl/SkGeometry.h', | 
|  | 268     'sgl/SkGlobals.cpp', | 
|  | 269     'sgl/SkGlyphCache.cpp', | 
|  | 270     'sgl/SkGlyphCache.h', | 
|  | 271     'sgl/SkGraphics.cpp', | 
|  | 272     'sgl/SkMask.cpp', | 
|  | 273     'sgl/SkMaskFilter.cpp', | 
|  | 274     'sgl/SkPackBits.cpp', | 
|  | 275     'sgl/SkPaint.cpp', | 
|  | 276     'sgl/SkPath.cpp', | 
|  | 277     'sgl/SkPathEffect.cpp', | 
|  | 278     'sgl/SkPathMeasure.cpp', | 
|  | 279     'sgl/SkPixelRef.cpp', | 
|  | 280     'sgl/SkProcSpriteBlitter.cpp', | 
|  | 281     'sgl/SkPtrRecorder.cpp', | 
|  | 282     'sgl/SkRasterizer.cpp', | 
|  | 283     'sgl/SkRefCnt.cpp', | 
|  | 284     'sgl/SkRegion_path.cpp', | 
|  | 285     'sgl/SkScalerContext.cpp', | 
|  | 286     'sgl/SkScan.cpp', | 
|  | 287     'sgl/SkScan.h', | 
|  | 288     'sgl/SkScan_Antihair.cpp', | 
|  | 289     'sgl/SkScan_AntiPath.cpp', | 
|  | 290     'sgl/SkScan_Hairline.cpp', | 
|  | 291     'sgl/SkScan_Path.cpp', | 
|  | 292     'sgl/SkScanPriv.h', | 
|  | 293     'sgl/SkShader.cpp', | 
|  | 294     'sgl/SkSpriteBlitter.h', | 
|  | 295     'sgl/SkSpriteBlitter_ARGB32.cpp', | 
|  | 296     'sgl/SkSpriteBlitter_RGB16.cpp', | 
|  | 297     'sgl/SkSpriteBlitterTemplate.h', | 
|  | 298     'sgl/SkString.cpp', | 
|  | 299     'sgl/SkStroke.cpp', | 
|  | 300     'sgl/SkStrokerPriv.cpp', | 
|  | 301     'sgl/SkStrokerPriv.h', | 
|  | 302     'sgl/SkTemplatesPriv.h', | 
|  | 303     'sgl/SkTSearch.cpp', | 
|  | 304     'sgl/SkTSort.h', | 
|  | 305     'sgl/SkTypeface_fake.cpp', | 
|  | 306     'sgl/SkUtils.cpp', | 
|  | 307     'sgl/SkWriter32.cpp', | 
|  | 308     'sgl/SkXfermode.cpp', | 
|  | 309   ]), | 
|  | 310 | 
|  | 311   MSVSFilter('ports', [ | 
|  | 312     'ports/sk_predefined_gamma.h', | 
|  | 313     'ports/SkFontHost_none.cpp', | 
|  | 314     'ports/SkGlobals_global.cpp', | 
|  | 315     'ports/SkImageDecoder_Factory.cpp', | 
|  | 316     'ports/SkOSFile_stdio.cpp', | 
|  | 317     'ports/SkThread_win.cpp', | 
|  | 318   ]), | 
|  | 319 | 
|  | 320   MSVSFilter('images', [ | 
|  | 321     'images/SkImageDecoder.cpp', | 
|  | 322     'images/SkImageRef.cpp', | 
|  | 323     'images/SkScaledBitmapSampler.h', | 
|  | 324     'images/SkStream.cpp', | 
|  | 325   ]), | 
|  | 326 | 
|  | 327   MSVSFilter('effects', [ | 
|  | 328     'effects/Sk1DPathEffect.cpp', | 
|  | 329     'effects/Sk2DPathEffect.cpp', | 
|  | 330     'effects/SkAvoidXfermode.cpp', | 
|  | 331     'effects/SkBlurDrawLooper.cpp', | 
|  | 332     'effects/SkBlurMask.cpp', | 
|  | 333     'effects/SkBlurMaskFilter.cpp', | 
|  | 334     'effects/SkCamera.cpp', | 
|  | 335     'effects/SkColorFilters.cpp', | 
|  | 336     'effects/SkColorMatrix.cpp', | 
|  | 337     'effects/SkColorMatrixFilter.cpp', | 
|  | 338     'effects/SkCornerPathEffect.cpp', | 
|  | 339     'effects/SkCullPoints.cpp', | 
|  | 340     'effects/SkDashPathEffect.cpp', | 
|  | 341     'effects/SkDiscretePathEffect.cpp', | 
|  | 342     'effects/SkEmbossMask.cpp', | 
|  | 343     'effects/SkEmbossMaskFilter.cpp', | 
|  | 344     'effects/SkGradientShader.cpp', | 
|  | 345     'effects/SkKernel33MaskFilter.cpp', | 
|  | 346     'effects/SkLayerRasterizer.cpp', | 
|  | 347     'effects/SkPaintFlagsDrawFilter.cpp', | 
|  | 348     'effects/SkPixelXorXfermode.cpp', | 
|  | 349     'effects/SkRadialGradient_Table.h', | 
|  | 350     'effects/SkShaderExtras.cpp', | 
|  | 351     'effects/SkTransparentShader.cpp', | 
|  | 352     'effects/SkUnitMappers.cpp', | 
|  | 353   ]), | 
|  | 354 | 
|  | 355   MSVSFilter('animator', [ | 
|  | 356     'animator/SkTime.cpp', | 
|  | 357   ]), | 
|  | 358 | 
|  | 359   MSVSFilter('picture', [ | 
|  | 360     'picture/SkPathHeap.cpp', | 
|  | 361     'picture/SkPathHeap.h', | 
|  | 362     'picture/SkPicture.cpp', | 
|  | 363     'picture/SkPictureFlat.cpp', | 
|  | 364     'picture/SkPictureFlat.h', | 
|  | 365     'picture/SkPicturePlayback.cpp', | 
|  | 366     'picture/SkPicturePlayback.h', | 
|  | 367     'picture/SkPictureRecord.cpp', | 
|  | 368     'picture/SkPictureRecord.h', | 
|  | 369   ]), | 
|  | 370 | 
|  | 371   MSVSFilter('ext', [ | 
|  | 372     'ext/convolver.cc', | 
|  | 373     'ext/convolver.h', | 
|  | 374     'ext/bitmap_platform_device.h', | 
|  | 375     'ext/bitmap_platform_device_win.cc', | 
|  | 376     'ext/bitmap_platform_device_win.h', | 
|  | 377     'ext/image_operations.cc', | 
|  | 378     'ext/image_operations.h', | 
|  | 379     'ext/platform_canvas.h', | 
|  | 380     'ext/platform_canvas_win.cc', | 
|  | 381     'ext/platform_canvas_win.h', | 
|  | 382     'ext/platform_device.h', | 
|  | 383     'ext/platform_device_win.cc', | 
|  | 384     'ext/platform_device_win.h', | 
|  | 385     'ext/skia_utils.cc', | 
|  | 386     'ext/skia_utils.h', | 
|  | 387     'ext/skia_utils_win.cc', | 
|  | 388     'ext/skia_utils_win.h', | 
|  | 389     'ext/vector_canvas.cc', | 
|  | 390     'ext/vector_canvas.h', | 
|  | 391     'ext/vector_device.cc', | 
|  | 392     'ext/vector_device.h', | 
|  | 393 | 
|  | 394   ]), | 
|  | 395 | 
|  | 396     'precompiled.cc', | 
|  | 397 ]) | 
| 161 | 398 | 
| 162 if env.Bit('linux'): | 399 if env.Bit('linux'): | 
| 163   input_files.append('ext/bitmap_platform_device_linux.cc') | 400   input_files.append('ext/bitmap_platform_device_linux.cc') | 
| 164   input_files.append('ext/platform_canvas_linux.cc') | 401   input_files.append('ext/platform_canvas_linux.cc') | 
| 165   input_files.append('ext/platform_device_linux.cc') | 402   input_files.append('ext/platform_device_linux.cc') | 
| 166 | 403 | 
| 167   # On Linux we use Skia to render fonts with FreeType and fontconfig | 404   # On Linux we use Skia to render fonts with FreeType and fontconfig | 
| 168   input_files.remove('sgl/SkTypeface_fake.cpp') | 405   input_files.Remove('sgl/SkTypeface_fake.cpp') | 
| 169   input_files.remove('ports/SkFontHost_none.cpp') | 406   input_files.Remove('ports/SkFontHost_none.cpp') | 
| 170   input_files.append('sgl/SkTypeface.cpp') | 407   input_files.append('sgl/SkTypeface.cpp') | 
| 171   input_files.append('ports/SkFontHost_FreeType.cpp') | 408   input_files.append('ports/SkFontHost_FreeType.cpp') | 
| 172   input_files.append('ports/SkFontHost_TrueType_Tables.cpp') | 409   input_files.append('ports/SkFontHost_TrueType_Tables.cpp') | 
| 173   input_files.append('ports/SkFontHost_gamma_none.cpp') | 410   input_files.append('ports/SkFontHost_gamma_none.cpp') | 
| 174   input_files.append('ports/SkFontHost_fontconfig.cpp') | 411   input_files.append('ports/SkFontHost_fontconfig.cpp') | 
| 175   input_files.append('images/SkMMapStream.cpp') | 412   input_files.append('images/SkMMapStream.cpp') | 
| 176 | 413 | 
| 177   env.Append(CCFLAGS = ['-Wno-unused-function']) | 414   env.Append(CCFLAGS = ['-Wno-unused-function']) | 
| 178 | 415 | 
| 179 if env.Bit('posix'): | 416 if env.Bit('posix'): | 
| 180   input_files.append('ports/SkThread_pthread.cpp') | 417   input_files.append('ports/SkThread_pthread.cpp') | 
| 181 | 418 | 
| 182 if env.Bit('mac'): | 419 if env.Bit('mac'): | 
| 183   input_files.append('ext/bitmap_platform_device_mac.cc') | 420   input_files.append('ext/bitmap_platform_device_mac.cc') | 
| 184   input_files.append('ext/platform_canvas_mac.cc') | 421   input_files.append('ext/platform_canvas_mac.cc') | 
| 185   input_files.append('ext/platform_device_mac.cc') | 422   input_files.append('ext/platform_device_mac.cc') | 
| 186 | 423 | 
|  | 424 if not env.Bit('windows'): | 
|  | 425   input_files.Remove( | 
|  | 426       'ext/bitmap_platform_device_win.cc', | 
|  | 427       'ext/bitmap_platform_device_win.h', | 
|  | 428       'ext/platform_canvas_win.cc', | 
|  | 429       'ext/platform_canvas_win.h', | 
|  | 430       'ext/platform_device_win.cc', | 
|  | 431       'ext/platform_device_win.h', | 
|  | 432       'ext/skia_utils_win.cc', | 
|  | 433       'ext/skia_utils_win.h', | 
|  | 434       'ext/vector_canvas.cc', | 
|  | 435       'ext/vector_canvas.h', | 
|  | 436       'ext/vector_device.cc', | 
|  | 437       'ext/vector_device.h', | 
|  | 438 | 
|  | 439       'ports/SkThread_win.cpp', | 
|  | 440   ) | 
|  | 441 | 
| 187 if env.Bit('windows'): | 442 if env.Bit('windows'): | 
| 188   input_files.append('ext/bitmap_platform_device_win.cc') |  | 
| 189   input_files.append('ext/platform_canvas_win.cc') |  | 
| 190   input_files.append('ext/platform_device_win.cc') |  | 
| 191   input_files.append('ext/skia_utils_win.cc') |  | 
| 192   input_files.append('ext/vector_canvas.cc') |  | 
| 193   input_files.append('ext/vector_device.cc') |  | 
| 194 |  | 
| 195   input_files.append('ports/SkThread_win.cpp') |  | 
| 196 |  | 
| 197   env_p = env.Clone( | 443   env_p = env.Clone( | 
| 198     PCHSTOP = 'SkTypes.h', | 444     PCHSTOP = 'SkTypes.h', | 
| 199     PDB = 'vc80.pdb', | 445     PDB = 'vc80.pdb', | 
| 200   ) | 446   ) | 
| 201 | 447 | 
| 202   # TODO(rspangler): This step forces -Zi, but doesn't actually use it.  Need to | 448   # TODO(rspangler): This step forces -Zi, but doesn't actually use it.  Need to | 
| 203   # fix so it doesn't override our -Z7.  -Zi also causes vc80.pdb to be created | 449   # fix so it doesn't override our -Z7.  -Zi also causes vc80.pdb to be created | 
| 204   # in the skia directory. | 450   # in the skia directory. | 
| 205   # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. | 451   # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. | 
| 206   # It's a 0-length file so likely harmless.  Is this a side effect of having | 452   # It's a 0-length file so likely harmless.  Is this a side effect of having | 
| 207   # IncrediBuild installed on the build machine? | 453   # IncrediBuild installed on the build machine? | 
| 208   pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc') | 454   pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc') | 
| 209   env_p['PCH'] = pch | 455   env_p['PCH'] = pch | 
| 210   input_files += [obj] | 456   input_files.Replace('precompiled.cc', obj) | 
| 211 | 457 | 
| 212 env.ChromeStaticLibrary('skia', input_files) | 458 env.ChromeStaticLibrary('skia', input_files) | 
| 213 | 459 | 
| 214 env.ChromeMSVSProject('$SKIA_DIR/skia.vcproj', | 460 p = env.ChromeMSVSProject('skia.vcproj', | 
| 215                 guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}') | 461                           guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}', | 
|  | 462                           files=input_files, | 
|  | 463                           relative_path_prefix=r'./', | 
|  | 464                           tools = [ | 
|  | 465                               'VCPreBuildEventTool', | 
|  | 466                               'VCCustomBuildTool', | 
|  | 467                               'VCXMLDataGeneratorTool', | 
|  | 468                               'VCWebServiceProxyGeneratorTool', | 
|  | 469                               'VCMIDLTool', | 
|  | 470                               'VCCLCompilerTool', | 
|  | 471                               'VCManagedResourceCompilerTool', | 
|  | 472                               'VCResourceCompilerTool', | 
|  | 473                               'VCPreLinkEventTool', | 
|  | 474                               'VCLibrarianTool', | 
|  | 475                               'VCALinkTool', | 
|  | 476                               'VCXDCMakeTool', | 
|  | 477                               'VCBscMakeTool', | 
|  | 478                               'VCFxCopTool', | 
|  | 479                               'VCPostBuildEventTool', | 
|  | 480                           ]) | 
|  | 481 | 
|  | 482 p.AddConfig('Debug|Win32', | 
|  | 483             ConfigurationType = '4', | 
|  | 484             InheritedPropertySheets = [ | 
|  | 485                 '$(SolutionDir)../build/debug.vsprops', | 
|  | 486                 './skia.vsprops', | 
|  | 487                 './precompiled.vsprops', | 
|  | 488             ]) | 
|  | 489 | 
|  | 490 p.AddConfig('Release|Win32', | 
|  | 491             ConfigurationType = '4', | 
|  | 492             InheritedPropertySheets = [ | 
|  | 493                 '$(SolutionDir)../build/release.vsprops', | 
|  | 494                 './skia.vsprops', | 
|  | 495             ]) | 
|  | 496 | 
|  | 497 p.AddFileConfig( | 
|  | 498     'precompiled.cc', | 
|  | 499     'Debug|Win32', | 
|  | 500     tools=[ | 
|  | 501         MSVSTool('VCCLCompilerTool', UsePrecompiledHeader='1'), | 
|  | 502     ]) | 
|  | 503 | 
|  | 504 p.AddFileConfig( | 
|  | 505     'precompiled.cc', | 
|  | 506     'Release|Win32', | 
|  | 507     ExcludedFromBuild='true', | 
|  | 508     tools=[ | 
|  | 509         MSVSTool('VCCLCompilerTool'), | 
|  | 510     ]) | 
|  | 511 | 
|  | 512 env.AlwaysBuild(p) | 
|  | 513 | 
|  | 514 i = env.Command('$CHROME_SRC_DIR/skia/skia.vcproj', p, | 
|  | 515                 Copy('$TARGET', '$SOURCE')) | 
|  | 516 Alias('msvs', i) | 
| OLD | NEW | 
|---|