diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 16:05:37 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 16:05:37 +0000 |
| commit | 25e92838a9af4885670fe7ff6950da0994cfb958 (patch) | |
| tree | 4d67a797ccb3b150cfca7dcedd241e07fc859803 /gyp/images.gyp | |
| parent | cd19a5f194e8032038337758fd806a33d0bda0b0 (diff) | |
fix gm on Mac, and Linux buildbot build, by adding zlib source to third_party
http://codereview.appspot.com/4620047/
I will try to find a better way to keep all this working (remove zlib and
libpng from third_party)
git-svn-id: http://skia.googlecode.com/svn/trunk@1595 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/images.gyp')
| -rw-r--r-- | gyp/images.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 7f2c8a4d92..705f7a3aff 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -68,11 +68,23 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + # libpng stuff: + # Any targets that depend on this target should link in libpng and + # our code that calls it. + # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings + 'dependencies' : [ + 'libpng.gyp:libpng', + ], + 'link_settings': { + 'sources': [ + '../src/images/SkImageDecoder_libpng.cpp', + ], + }, + # end libpng stuff }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ |