Chromium Code Reviews| Index: gyp/images.gyp |
| diff --git a/gyp/images.gyp b/gyp/images.gyp |
| index b5d0334fa67fd258bf6a45bb8becee41f843ef3d..d3ffe7e891beaa4f83a82c52639df40c399e2175 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 and libgif and |
|
djsollen
2013/04/11 18:25:33
libpng, libgif, and...
scroggo
2013/04/11 18:31:47
Done.
|
| # 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', |
|
scroggo
2013/04/11 16:50:56
senorblanco@, it looks like you added this line. D
|
| ], |
| 'libraries': [ |
| + '-lgif', |
| '-lpng', |
| '-lz', |
| ], |
| }, |
| - # end libpng stuff |
| + # end libpng/libgif stuff |
| }], |
| [ 'skia_os == "android"', { |
| 'include_dirs': [ |