Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'images', | 4 'target_name': 'images', |
| 5 'product_name': 'skia_images', | 5 'product_name': 'skia_images', |
| 6 'type': 'static_library', | 6 'type': 'static_library', |
| 7 'standalone_static_library': 1, | 7 'standalone_static_library': 1, |
| 8 'dependencies': [ | 8 'dependencies': [ |
| 9 'libjpeg.gyp:*', | 9 'libjpeg.gyp:*', |
| 10 'libwebp.gyp:libwebp', | 10 'libwebp.gyp:libwebp', |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 '../src/images/SkImageDecoder_libgif.cpp', | 90 '../src/images/SkImageDecoder_libgif.cpp', |
| 91 '../src/images/SkImageEncoder_Factory.cpp', | 91 '../src/images/SkImageEncoder_Factory.cpp', |
| 92 '../src/images/SkMovie_gif.cpp', | 92 '../src/images/SkMovie_gif.cpp', |
| 93 ], | 93 ], |
| 94 },{ #else if skia_os != mac | 94 },{ #else if skia_os != mac |
| 95 'sources!': [ | 95 'sources!': [ |
| 96 '../src/ports/SkImageDecoder_CG.cpp', | 96 '../src/ports/SkImageDecoder_CG.cpp', |
| 97 ], | 97 ], |
| 98 }], | 98 }], |
| 99 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { | 99 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { |
| 100 'sources!': [ | 100 # Any targets that depend on this target should link in libpng and lib gif and |
|
djsollen
2013/04/11 18:25:33
libpng, libgif, and...
scroggo
2013/04/11 18:31:47
Done.
| |
| 101 '../src/images/SkImageDecoder_libgif.cpp', | |
| 102 '../src/images/SkMovie_gif.cpp', | |
| 103 ], | |
| 104 # libpng stuff: | |
| 105 # Any targets that depend on this target should link in libpng and | |
| 106 # our code that calls it. | 101 # our code that calls it. |
| 107 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings | 102 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings |
| 108 'link_settings': { | 103 'link_settings': { |
| 109 'sources': [ | 104 'sources': [ |
| 110 '../src/images/SkImageDecoder_libpng.cpp', | 105 '../src/images/SkImageDecoder_libpng.cpp', |
|
scroggo
2013/04/11 16:50:56
senorblanco@, it looks like you added this line. D
| |
| 111 ], | 106 ], |
| 112 'libraries': [ | 107 'libraries': [ |
| 108 '-lgif', | |
| 113 '-lpng', | 109 '-lpng', |
| 114 '-lz', | 110 '-lz', |
| 115 ], | 111 ], |
| 116 }, | 112 }, |
| 117 # end libpng stuff | 113 # end libpng/libgif stuff |
| 118 }], | 114 }], |
| 119 [ 'skia_os == "android"', { | 115 [ 'skia_os == "android"', { |
| 120 'include_dirs': [ | 116 'include_dirs': [ |
| 121 '../src/utils', | 117 '../src/utils', |
| 122 ], | 118 ], |
| 123 'dependencies': [ | 119 'dependencies': [ |
| 124 'android_deps.gyp:gif', | 120 'android_deps.gyp:gif', |
| 125 'android_deps.gyp:png', | 121 'android_deps.gyp:png', |
| 126 ], | 122 ], |
| 127 },{ #else if skia_os != android | 123 },{ #else if skia_os != android |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 144 }, | 140 }, |
| 145 }, | 141 }, |
| 146 ], | 142 ], |
| 147 } | 143 } |
| 148 | 144 |
| 149 # Local Variables: | 145 # Local Variables: |
| 150 # tab-width:2 | 146 # tab-width:2 |
| 151 # indent-tabs-mode:nil | 147 # indent-tabs-mode:nil |
| 152 # End: | 148 # End: |
| 153 # vim: set expandtab tabstop=2 shiftwidth=2: | 149 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |