diff options
| author |  msarett <msarett@google.com> | 2015-03-27 12:17:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-27 12:17:00 -0700 |
| commit | 255dcd11992ebe74eb54202c48cf5394d33a8ce6 (patch) | |
| tree | cebd8cf7ae2a220fd24a2cc9b5fe605abef11ea0 /gyp/images.gyp | |
| parent | a096d7a6d03662073f4cd46f7db5fe2cf5495c36 (diff) | |
WIP: Added support for giflib, updated jpeg and png
BUG=skia:3257
Review URL: https://codereview.chromium.org/1038863003
Diffstat (limited to 'gyp/images.gyp')
| -rw-r--r-- | gyp/images.gyp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 4cce08e7a1..34cc8a8fa8 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -2,6 +2,7 @@ # # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. + # GYP file for images project. { 'targets': [ @@ -12,6 +13,7 @@ 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:*', + 'giflib.gyp:giflib', 'libjpeg.gyp:*', 'etc1.gyp:libetc1', 'ktx.gyp:libSkKTX', @@ -87,6 +89,9 @@ '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkMovie_gif.cpp', ], + 'dependencies!': [ + 'giflib.gyp:giflib' + ], 'link_settings': { 'libraries': [ '-lwindowscodecs.lib', @@ -112,13 +117,11 @@ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'export_dependent_settings': [ 'libpng.gyp:libpng', - 'giflib.gyp:giflib' ], 'dependencies': [ 'libpng.gyp:libpng', - 'giflib.gyp:giflib' ], - # end libpng/libgif stuff + # end libpng stuff }], # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out # to remove gif. Once gif is supported by naclports, this can be merged into the above @@ -128,13 +131,15 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkMovie_gif.cpp', ], + 'dependencies!': [ + 'giflib.gyp:giflib' + ], }], [ 'skia_os == "android"', { 'include_dirs': [ '../src/utils', ], 'dependencies': [ - 'android_deps.gyp:gif', 'android_deps.gyp:png', ], 'conditions': [ @@ -156,8 +161,7 @@ }], [ 'skia_os == "chromeos"', { 'dependencies': [ - 'chromeos_deps.gyp:gif', - 'libpng.gyp:libpng', + 'libpng.gyp:libpng', ], }], [ 'skia_os == "ios"', { |