diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/images.gyp | 6 | ||||
| -rw-r--r-- | gyp/libpng.gyp | 51 | ||||
| -rw-r--r-- | gyp/zlib.gyp | 53 |
3 files changed, 3 insertions, 107 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 7aacd9ac14..e052f1e34d 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -96,13 +96,13 @@ # 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', ], + 'libraries': [ + '-lpng', + ], }, # end libpng stuff }], diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp deleted file mode 100644 index 2998baaab6..0000000000 --- a/gyp/libpng.gyp +++ /dev/null @@ -1,51 +0,0 @@ -# Gyp config to build libpng as needed for Skia. -{ - 'targets': [ - { - 'target_name': 'libpng', - 'type': 'static_library', - 'dependencies': [ - 'zlib.gyp:zlib', - ], - 'include_dirs': [ - '../third_party/libpng', - ], - 'sources': [ - '../third_party/libpng/png.h', - '../third_party/libpng/pngconf.h', - '../third_party/libpng/pngdebug.h', - '../third_party/libpng/pnginfo.h', - '../third_party/libpng/pnglibconf.h', - '../third_party/libpng/pngpriv.h', - '../third_party/libpng/pngstruct.h', - - '../third_party/libpng/png.c', - '../third_party/libpng/pngerror.c', - '../third_party/libpng/pngget.c', - '../third_party/libpng/pngmem.c', - '../third_party/libpng/pngpread.c', - '../third_party/libpng/pngread.c', - '../third_party/libpng/pngrio.c', - '../third_party/libpng/pngrtran.c', - '../third_party/libpng/pngrutil.c', - '../third_party/libpng/pngset.c', - '../third_party/libpng/pngtrans.c', - '../third_party/libpng/pngwio.c', - '../third_party/libpng/pngwrite.c', - '../third_party/libpng/pngwtran.c', - '../third_party/libpng/pngwutil.c', - ], - 'all_dependent_settings': { - 'include_dirs': [ - '../third_party/libpng', - ], - }, - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp deleted file mode 100644 index 3e1fd0a352..0000000000 --- a/gyp/zlib.gyp +++ /dev/null @@ -1,53 +0,0 @@ -# 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: |