Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # GYP file for images project. | 1 # GYP file for images project. |
| 2 { | 2 { |
| 3 'targets': [ | 3 'targets': [ |
| 4 { | 4 { |
| 5 'target_name': 'images', | 5 'target_name': 'images', |
| 6 'product_name': 'skia_images', | 6 'product_name': 'skia_images', |
| 7 'type': 'static_library', | 7 'type': 'static_library', |
| 8 'standalone_static_library': 1, | 8 'standalone_static_library': 1, |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 'libjpeg.gyp:*', | 10 'libjpeg.gyp:*', |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 },{ #else if skia_os != mac | 99 },{ #else if skia_os != mac |
| 100 'sources!': [ | 100 'sources!': [ |
| 101 '../src/ports/SkImageDecoder_CG.cpp', | 101 '../src/ports/SkImageDecoder_CG.cpp', |
| 102 ], | 102 ], |
| 103 }], | 103 }], |
| 104 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { | 104 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { |
| 105 # Any targets that depend on this target should link in libpng, libgif , and | 105 # Any targets that depend on this target should link in libpng, libgif , and |
| 106 # our code that calls it. | 106 # our code that calls it. |
| 107 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings | 107 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings |
| 108 'link_settings': { | 108 'link_settings': { |
| 109 'sources': [ | |
| 110 '../src/images/SkImageDecoder_libpng.cpp', | |
|
djsollen
2013/06/12 17:35:46
why did we need to remove this?
Zach Reizner
2013/06/12 17:42:40
This file is already included above. Sourcing it t
bungeman-skia
2013/06/12 19:16:55
This is slightly bizarre. What this (to be deleted
| |
| 111 ], | |
| 112 'libraries': [ | 109 'libraries': [ |
| 113 '-lgif', | 110 '-lgif', |
| 114 '-lpng', | 111 '-lpng', |
| 115 '-lz', | 112 '-lz', |
| 116 ], | 113 ], |
| 117 }, | 114 }, |
| 118 # end libpng/libgif stuff | 115 # end libpng/libgif stuff |
| 119 }], | 116 }], |
| 120 # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out | 117 # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out |
| 121 # to remove gif. Once gif is supported by naclports, this can be merged into the above | 118 # to remove gif. Once gif is supported by naclports, this can be merged into the above |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 173 }, | 170 }, |
| 174 }, | 171 }, |
| 175 ], | 172 ], |
| 176 } | 173 } |
| 177 | 174 |
| 178 # Local Variables: | 175 # Local Variables: |
| 179 # tab-width:2 | 176 # tab-width:2 |
| 180 # indent-tabs-mode:nil | 177 # indent-tabs-mode:nil |
| 181 # End: | 178 # End: |
| 182 # vim: set expandtab tabstop=2 shiftwidth=2: | 179 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |