| Index: gyp/images.gyp
|
| diff --git a/gyp/images.gyp b/gyp/images.gyp
|
| index e4ab9edc100066f5e08a2f97192118fb3fecdbd2..7b1636e02b9845cdb1e8ab905e78d19039823ee8 100644
|
| --- a/gyp/images.gyp
|
| +++ b/gyp/images.gyp
|
| @@ -17,6 +17,7 @@
|
| 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
|
| 'etc1.gyp:libetc1',
|
| 'ktx.gyp:libSkKTX',
|
| + 'libpng.gyp:libpng',
|
| 'libwebp.gyp:libwebp',
|
| 'utils.gyp:utils',
|
| ],
|
| @@ -57,7 +58,6 @@
|
| 'conditions': [
|
| [ 'skia_os == "win"', {
|
| 'sources!': [
|
| - '../src/images/SkPNGImageEncoder.cpp',
|
| '../src/images/SkGIFMovie.cpp',
|
| ],
|
| 'dependencies!': [
|
| @@ -75,7 +75,6 @@
|
| }],
|
| [ 'skia_os in ["mac", "ios"]', {
|
| 'sources!': [
|
| - '../src/images/SkPNGImageEncoder.cpp',
|
| '../src/images/SkGIFMovie.cpp',
|
| ],
|
| },{ #else if skia_os != mac
|
| @@ -83,12 +82,6 @@
|
| '../src/ports/SkImageEncoder_CG.cpp',
|
| ],
|
| }],
|
| - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
|
| - 'dependencies': [
|
| - 'libpng.gyp:libpng',
|
| - ],
|
| - # end libpng stuff
|
| - }],
|
| [ 'skia_os == "android"', {
|
| 'include_dirs': [
|
| '../src/utils',
|
|
|