diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-11 18:32:01 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-11 18:32:01 +0000 |
| commit | 9c5f969e7067c0d78b27a5c4245238eee2d7dfe8 (patch) | |
| tree | 16905b2fef579ee05f35d9acf7dca93aff80bd21 /gyp | |
| parent | 83165a5f71319b04beb561afb7c968493027bcbd (diff) | |
Include gif image decoding in images/ on linux.
Build SkImageDecoder_libgif in images project and link against
libgif on linux.
Ensure that the GIF decoder is used in skimage.
Requires a new dependency on libgif-dev when building on linux.
Review URL: https://codereview.chromium.org/14029011
git-svn-id: http://skia.googlecode.com/svn/trunk@8627 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/images.gyp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index b5d0334fa6..93e95a42c1 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -97,12 +97,7 @@ ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { - 'sources!': [ - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkMovie_gif.cpp', - ], - # libpng stuff: - # Any targets that depend on this target should link in libpng and + # Any targets that depend on this target should link in libpng, libgif, and # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'link_settings': { @@ -110,11 +105,12 @@ '../src/images/SkImageDecoder_libpng.cpp', ], 'libraries': [ + '-lgif', '-lpng', '-lz', ], }, - # end libpng stuff + # end libpng/libgif stuff }], [ 'skia_os == "android"', { 'include_dirs': [ |