diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-05 14:52:01 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-05 14:52:01 +0000 |
| commit | 3a4553ea577812b38859a2d2e0590e4e9adcc8dc (patch) | |
| tree | 31be7d566ce492a7bd0876b80b0911eaa615d251 /gyp | |
| parent | dd743fefad9764ad86d7f69deec32e9a3b5de47f (diff) | |
Redelivering r3611 changes (enabling cmyk jpeg changes in .gyps)
http://codereview.appspot.com/5967047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3617 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gmslides.gypi | 1 | ||||
| -rw-r--r-- | gyp/images.gyp | 16 | ||||
| -rw-r--r-- | gyp/libjpeg.gyp | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 491af68e64..8442d7d2fc 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -14,6 +14,7 @@ '../gm/complexclip2.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', + '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', diff --git a/gyp/images.gyp b/gyp/images.gyp index a4bdcd00ff..b92c9db34d 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -4,9 +4,12 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ - 'libjpeg.gyp:libjpeg', + 'libjpeg.gyp:*', 'utils.gyp:utils', ], + 'export_dependent_settings': [ + 'libjpeg.gyp:*', + ], 'include_dirs': [ '../include/config', '../include/core', @@ -28,6 +31,7 @@ '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', @@ -52,14 +56,11 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -74,13 +75,10 @@ }], [ 'skia_os == "mac"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -90,10 +88,7 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -112,7 +107,6 @@ }], [ 'skia_os == "android"', { 'sources!': [ - '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp index b7ce7a8114..dcf14509a2 100644 --- a/gyp/libjpeg.gyp +++ b/gyp/libjpeg.gyp @@ -76,7 +76,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '.', + '../third_party/externals/libjpeg', ], }, 'conditions': [ |