diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 8 | ||||
| -rw-r--r-- | gyp/core.gypi | 7 | ||||
| -rw-r--r-- | gyp/effects.gypi | 4 | ||||
| -rw-r--r-- | gyp/tools.gyp | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index f2301db7d2..dd697b7c39 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -84,7 +84,7 @@ '../samplecode/SampleLayerMask.cpp', '../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', - '../samplecode/SampleLighting.cpp', + '../samplecode/SampleLighting.cpp', '../samplecode/SampleLines.cpp', '../samplecode/SampleLua.cpp', '../samplecode/SampleManyRects.cpp', @@ -245,9 +245,9 @@ 'android_deps.gyp:Android_SampleApp', ], }], - [ 'skia_os == "chromeos"', { - 'sources!': [ - '../samplecode/SampleLighting.cpp', #doesn't compile due to gpu dependencies + [ 'skia_os == "chromeos"', { + 'sources!': [ + '../samplecode/SampleLighting.cpp', #doesn't compile due to gpu dependencies ], }], [ 'skia_gpu == 1', { diff --git a/gyp/core.gypi b/gyp/core.gypi index ef449c0f8a..badd3217b6 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -117,8 +117,11 @@ '<(skia_src_path)/core/SkImageCacherator.cpp', '<(skia_src_path)/core/SkImageGenerator.cpp', '<(skia_src_path)/core/SkLayerInfo.h', - '<(skia_src_path)/core/SkLocalMatrixShader.cpp', + '<(skia_src_path)/core/SkLight.h', + '<(skia_src_path)/core/SkLightingShader.h', + '<(skia_src_path)/core/SkLightingShader.cpp', '<(skia_src_path)/core/SkLineClipper.cpp', + '<(skia_src_path)/core/SkLocalMatrixShader.cpp', '<(skia_src_path)/core/SkMallocPixelRef.cpp', '<(skia_src_path)/core/SkMask.cpp', '<(skia_src_path)/core/SkMaskCache.cpp', @@ -162,6 +165,7 @@ '<(skia_src_path)/core/SkPixelRef.cpp', '<(skia_src_path)/core/SkPixmap.cpp', '<(skia_src_path)/core/SkPoint.cpp', + '<(skia_src_path)/core/SkPoint3.cpp', '<(skia_src_path)/core/SkPtrRecorder.cpp', '<(skia_src_path)/core/SkQuadClipper.cpp', '<(skia_src_path)/core/SkQuadClipper.h', @@ -305,6 +309,7 @@ '<(skia_include_path)/core/SkPictureRecorder.h', '<(skia_include_path)/core/SkPixelRef.h', '<(skia_include_path)/core/SkPoint.h', + '<(skia_include_path)/core/SkPoint3.h', '<(skia_include_path)/core/SkPreConfig.h', '<(skia_include_path)/core/SkRasterizer.h', '<(skia_include_path)/core/SkRect.h', diff --git a/gyp/effects.gypi b/gyp/effects.gypi index 04dcd08875..053942484a 100644 --- a/gyp/effects.gypi +++ b/gyp/effects.gypi @@ -45,8 +45,6 @@ '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLerpXfermode.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', - '<(skia_src_path)/effects/SkLightingShader.h', - '<(skia_src_path)/effects/SkLightingShader.cpp', '<(skia_src_path)/effects/SkLumaColorFilter.cpp', '<(skia_src_path)/effects/SkMagnifierImageFilter.cpp', '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', @@ -57,7 +55,6 @@ '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', '<(skia_src_path)/effects/SkPictureImageFilter.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', - '<(skia_src_path)/effects/SkPoint3.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', '<(skia_src_path)/effects/SkTableColorFilter.cpp', '<(skia_src_path)/effects/SkTableMaskFilter.cpp', @@ -114,7 +111,6 @@ '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', '<(skia_include_path)/effects/SkPerlinNoiseShader.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', - '<(skia_include_path)/effects/SkPoint3.h', '<(skia_include_path)/effects/SkRectShaderImageFilter.h', '<(skia_include_path)/effects/SkTableColorFilter.h', '<(skia_include_path)/effects/SkTableMaskFilter.h', diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 17068fe28c..d7b2e131e7 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -101,6 +101,7 @@ ], 'include_dirs': [ '../src/fonts', + '../src/core', ], 'dependencies': [ 'resources', |