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 'core.gyp:*', | 10 'core.gyp:*', |
| 11 'libjpeg.gyp:*', | 11 'libjpeg.gyp:*', |
| 12 'libwebp.gyp:libwebp', | 12 'libwebp.gyp:libwebp', |
| 13 'utils.gyp:utils', | 13 'utils.gyp:utils', |
| 14 'libpng.gyp:libpng', | |
| 14 ], | 15 ], |
| 15 'conditions': [ | 16 'conditions': [ |
| 16 [ 'skia_android_framework == 0', { | 17 [ 'skia_android_framework == 0', { |
| 17 'export_dependent_settings': [ | 18 'export_dependent_settings': [ |
| 18 'libjpeg.gyp:*', | 19 'libjpeg.gyp:*', |
| 20 'libpng.gyp:libpng', | |
|
scroggo
2014/02/06 16:22:13
nit: should line up with libjpeg.
djsollen
2014/02/06 16:24:34
spacing
hal.canary
2014/02/06 18:01:57
Done.
hal.canary
2014/02/06 18:01:57
Done.
| |
| 19 ], | 21 ], |
| 20 }], | 22 }], |
| 21 ], | 23 ], |
| 22 'include_dirs': [ | 24 'include_dirs': [ |
| 23 '../include/images', | 25 '../include/images', |
| 24 '../src/lazy', | 26 '../src/lazy', |
| 25 # for access to SkErrorInternals.h | 27 # for access to SkErrorInternals.h |
| 26 '../src/core/', | 28 '../src/core/', |
| 27 # for access to SkImagePriv.h | 29 # for access to SkImagePriv.h |
| 28 '../src/image/', | 30 '../src/image/', |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 112 '../src/images/SkImageDecoder_libpng.cpp', | 114 '../src/images/SkImageDecoder_libpng.cpp', |
| 113 '../src/images/SkImageDecoder_libgif.cpp', | 115 '../src/images/SkImageDecoder_libgif.cpp', |
| 114 '../src/images/SkMovie_gif.cpp', | 116 '../src/images/SkMovie_gif.cpp', |
| 115 ], | 117 ], |
| 116 },{ #else if skia_os != mac | 118 },{ #else if skia_os != mac |
| 117 'sources!': [ | 119 'sources!': [ |
| 118 '../src/ports/SkImageDecoder_CG.cpp', | 120 '../src/ports/SkImageDecoder_CG.cpp', |
| 119 ], | 121 ], |
| 120 }], | 122 }], |
| 121 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { | 123 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { |
| 122 # Any targets that depend on this target should link in libpng, libgif , and | 124 # Any targets that depend on this target should link in libpng, libgif , and |
|
scroggo
2014/02/06 16:22:13
This comment is out of date.
djsollen
2014/02/06 16:24:34
this comment is out of date and should be removed.
hal.canary
2014/02/06 18:01:57
Done.
hal.canary
2014/02/06 18:01:57
Done.
| |
| 123 # our code that calls it. | 125 # our code that calls it. |
| 124 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings | 126 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings |
| 125 'link_settings': { | 127 'dependencies': [ |
| 126 'libraries': [ | 128 'giflib.gyp:giflib' |
|
scroggo
2014/02/06 16:22:13
It appears that without this change, the images pr
hal.canary
2014/02/06 18:01:57
Exactly. giflib.gyp uses direct_dependent_setting
| |
| 127 '-lgif', | 129 ] |
| 128 '-lpng', | |
| 129 '-lz', | |
| 130 ], | |
| 131 }, | |
| 132 # end libpng/libgif stuff | 130 # end libpng/libgif stuff |
| 133 }], | 131 }], |
| 134 # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out | 132 # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out |
| 135 # to remove gif. Once gif is supported by naclports, this can be merged into the above | 133 # to remove gif. Once gif is supported by naclports, this can be merged into the above |
| 136 # condition. | 134 # condition. |
| 137 [ 'skia_os == "nacl"', { | 135 [ 'skia_os == "nacl"', { |
| 138 'sources!': [ | 136 'sources!': [ |
| 139 '../src/images/SkImageDecoder_libgif.cpp', | 137 '../src/images/SkImageDecoder_libgif.cpp', |
| 140 '../src/images/SkMovie_gif.cpp', | 138 '../src/images/SkMovie_gif.cpp', |
| 141 ], | 139 ], |
| 142 'link_settings': { | |
| 143 'libraries': [ | |
| 144 '-lpng', | |
| 145 '-lz', | |
| 146 ], | |
| 147 }, | |
| 148 }], | 140 }], |
| 149 [ 'skia_os == "android"', { | 141 [ 'skia_os == "android"', { |
| 150 'include_dirs': [ | 142 'include_dirs': [ |
| 151 '../src/utils', | 143 '../src/utils', |
| 152 ], | 144 ], |
| 153 'dependencies': [ | 145 'dependencies': [ |
| 154 'android_deps.gyp:gif', | 146 'android_deps.gyp:gif', |
| 155 'android_deps.gyp:png', | 147 'android_deps.gyp:png', |
| 156 ], | 148 ], |
| 157 'conditions': [ | 149 'conditions': [ |
| 158 [ 'skia_android_framework == 0', { | 150 [ 'skia_android_framework == 0', { |
| 159 'export_dependent_settings': [ | 151 'export_dependent_settings': [ |
| 160 'android_deps.gyp:png' | 152 'android_deps.gyp:png' |
| 161 ], | 153 ], |
| 162 }], | 154 }], |
| 163 ], | 155 ], |
| 164 },{ #else if skia_os != android | 156 },{ #else if skia_os != android |
| 165 'sources!': [ | 157 'sources!': [ |
| 166 '../src/images/SkImageRef_ashmem.h', | 158 '../src/images/SkImageRef_ashmem.h', |
| 167 '../src/images/SkImageRef_ashmem.cpp', | 159 '../src/images/SkImageRef_ashmem.cpp', |
| 168 ], | 160 ], |
| 169 }], | 161 }], |
| 170 [ 'skia_os == "chromeos"', { | 162 [ 'skia_os == "chromeos"', { |
| 171 'dependencies': [ | 163 'dependencies': [ |
| 172 'chromeos_deps.gyp:gif', | 164 'chromeos_deps.gyp:gif', |
| 173 ], | 165 ], |
| 174 'link_settings': { | |
| 175 'libraries': [ | |
| 176 '-lpng', | |
| 177 ], | |
| 178 }, | |
| 179 }], | 166 }], |
| 180 [ 'skia_os == "ios"', { | 167 [ 'skia_os == "ios"', { |
| 181 'include_dirs': [ | 168 'include_dirs': [ |
| 182 '../include/utils/mac', | 169 '../include/utils/mac', |
| 183 ], | 170 ], |
| 184 }], | 171 }], |
| 185 ], | 172 ], |
| 186 'direct_dependent_settings': { | 173 'direct_dependent_settings': { |
| 187 'include_dirs': [ | 174 'include_dirs': [ |
| 188 '../include/images', | 175 '../include/images', |
| 189 ], | 176 ], |
| 190 }, | 177 }, |
| 191 }, | 178 }, |
| 192 ], | 179 ], |
| 193 } | 180 } |
| OLD | NEW |