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

Side by Side Diff: gyp/images.gyp

Issue 14201002: Fix the NaCl build. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: 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 | 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 { 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 '../src/images/SkImageDecoder_libpng.cpp', 89 '../src/images/SkImageDecoder_libpng.cpp',
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"]', {
100 # Any targets that depend on this target should link in libpng, libgif , and 100 # Any targets that depend on this target should link in libpng, libgif , and
101 # our code that calls it. 101 # our code that calls it.
102 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings 102 # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent _Settings
103 'link_settings': { 103 'link_settings': {
104 'sources': [ 104 'sources': [
105 '../src/images/SkImageDecoder_libpng.cpp', 105 '../src/images/SkImageDecoder_libpng.cpp',
106 ], 106 ],
107 'libraries': [ 107 'libraries': [
108 '-lgif', 108 '-lgif',
109 '-lpng', 109 '-lpng',
110 '-lz', 110 '-lz',
111 ], 111 ],
112 }, 112 },
113 # end libpng/libgif stuff 113 # end libpng/libgif stuff
114 }], 114 }],
115 [ 'skia_os == "nacl"', {
116 'sources!': [
117 '../src/images/SkImageDecoder_libgif.cpp',
118 '../src/images/SkMovie_gif.cpp',
119 ],
120 'link_settings': {
121 'sources': [
122 '../src/images/SkImageDecoder_libpng.cpp',
123 ],
124 'libraries': [
125 '-lpng',
126 '-lz',
127 ],
128 },
129 }],
115 [ 'skia_os == "android"', { 130 [ 'skia_os == "android"', {
116 'include_dirs': [ 131 'include_dirs': [
117 '../src/utils', 132 '../src/utils',
118 ], 133 ],
119 'dependencies': [ 134 'dependencies': [
120 'android_deps.gyp:gif', 135 'android_deps.gyp:gif',
121 'android_deps.gyp:png', 136 'android_deps.gyp:png',
122 ], 137 ],
123 },{ #else if skia_os != android 138 },{ #else if skia_os != android
124 'sources!': [ 139 'sources!': [
(...skipping 15 matching lines...) Expand all
140 }, 155 },
141 }, 156 },
142 ], 157 ],
143 } 158 }
144 159
145 # Local Variables: 160 # Local Variables:
146 # tab-width:2 161 # tab-width:2
147 # indent-tabs-mode:nil 162 # indent-tabs-mode:nil
148 # End: 163 # End:
149 # vim: set expandtab tabstop=2 shiftwidth=2: 164 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698