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

3 files changed, 69 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!': [
diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp
index 07e89df025..2998baaab6 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -4,6 +4,9 @@
     {
       'target_name': 'libpng',
       'type': 'static_library',
+      'dependencies': [
+        'zlib.gyp:zlib',
+      ],
       'include_dirs': [
         '../third_party/libpng',
       ],
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
new file mode 100644
index 0000000000..3e1fd0a352
--- /dev/null
+++ b/gyp/zlib.gyp
@@ -0,0 +1,53 @@
+# Gyp config to build zlib as needed for Skia.
+{
+  'targets': [
+    {
+      'target_name': 'zlib',
+      'type': 'static_library',
+      'include_dirs': [
+        '../third_party/zlib',
+      ],
+      'sources': [
+        '../third_party/zlib/crc32.h',
+        '../third_party/zlib/deflate.h',
+        '../third_party/zlib/gzguts.h',
+        '../third_party/zlib/inffast.h',
+        '../third_party/zlib/inffixed.h',
+        '../third_party/zlib/inflate.h',
+        '../third_party/zlib/inftrees.h',
+        '../third_party/zlib/trees.h',
+        '../third_party/zlib/zconf.h',
+        '../third_party/zlib/zlib.h',
+        '../third_party/zlib/zutil.h',
+
+        '../third_party/zlib/adler32.c',
+        '../third_party/zlib/compress.c',
+        '../third_party/zlib/crc32.c',
+        '../third_party/zlib/deflate.c',
+        '../third_party/zlib/gzclose.c',
+        '../third_party/zlib/gzlib.c',
+        '../third_party/zlib/gzread.c',
+        '../third_party/zlib/gzwrite.c',
+        '../third_party/zlib/infback.c',
+        '../third_party/zlib/inffast.c',
+        '../third_party/zlib/inflate.c',
+        '../third_party/zlib/inftrees.c',
+        '../third_party/zlib/minigzip.c',
+        '../third_party/zlib/trees.c',
+        '../third_party/zlib/uncompr.c',
+        '../third_party/zlib/zutil.c',
+      ],
+      'all_dependent_settings': {
+        'include_dirs': [
+          '../third_party/zlib',
+        ],
+      },
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2: