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

Side by Side Diff: gyp/images.gyp

Issue 17408002: remove double including of libpng decoder (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add force linking to gm Created 7 years, 6 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 | « gm/gmmain.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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',
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
122 # condition. 119 # condition.
123 [ 'skia_os == "nacl"', { 120 [ 'skia_os == "nacl"', {
124 'sources!': [ 121 'sources!': [
125 '../src/images/SkImageDecoder_libgif.cpp', 122 '../src/images/SkImageDecoder_libgif.cpp',
126 '../src/images/SkMovie_gif.cpp', 123 '../src/images/SkMovie_gif.cpp',
127 ], 124 ],
128 'link_settings': { 125 'link_settings': {
129 'sources': [
130 '../src/images/SkImageDecoder_libpng.cpp',
131 ],
132 'libraries': [ 126 'libraries': [
133 '-lpng', 127 '-lpng',
134 '-lz', 128 '-lz',
135 ], 129 ],
136 }, 130 },
137 }], 131 }],
138 [ 'skia_os == "android"', { 132 [ 'skia_os == "android"', {
139 'include_dirs': [ 133 'include_dirs': [
140 '../src/utils', 134 '../src/utils',
141 ], 135 ],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 }, 167 },
174 }, 168 },
175 ], 169 ],
176 } 170 }
177 171
178 # Local Variables: 172 # Local Variables:
179 # tab-width:2 173 # tab-width:2
180 # indent-tabs-mode:nil 174 # indent-tabs-mode:nil
181 # End: 175 # End:
182 # vim: set expandtab tabstop=2 shiftwidth=2: 176 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gm/gmmain.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698