Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1157)

Side by Side Diff: gyp/images.gyp

Issue 14029011: Include gif image decoding in images/ on linux. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Respond to nit Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/skimage_main.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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, libgif , and
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',
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
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:
OLDNEW
« no previous file with comments | « no previous file | tools/skimage_main.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698