diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-11 22:24:35 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-11 22:24:35 +0000 |
| commit | 3f178280896882ee94ffb6da0362da6ab5451475 (patch) | |
| tree | b0c014579b0fe76117ac47c42313679c96abc704 | |
| parent | 98168bb394bbb10cd7d3468828e7dc4376a70e12 (diff) | |
Fix the NaCl build.
Do not attempt to build our gif files or link gif in Nacl.
Review URL: https://codereview.chromium.org/14201002
git-svn-id: http://skia.googlecode.com/svn/trunk@8635 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/images.gyp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 93e95a42c1..40d6426ddd 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -96,7 +96,7 @@ '../src/ports/SkImageDecoder_CG.cpp', ], }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { # Any targets that depend on this target should link in libpng, libgif, and # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings @@ -112,6 +112,24 @@ }, # end libpng/libgif stuff }], + # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out + # to remove gif. Once gif is supported by naclports, this can be merged into the above + # condition. + [ 'skia_os == "nacl"', { + 'sources!': [ + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkMovie_gif.cpp', + ], + 'link_settings': { + 'sources': [ + '../src/images/SkImageDecoder_libpng.cpp', + ], + 'libraries': [ + '-lpng', + '-lz', + ], + }, + }], [ 'skia_os == "android"', { 'include_dirs': [ '../src/utils', |