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

Side by Side Diff: gyp/libwebp.gyp

Issue 894773002: Build in C++11 mode on Macs. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 10 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
« no previous file with comments | « gyp/common_conditions.gypi ('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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'skia_warnings_as_errors': 0, 7 'skia_warnings_as_errors': 0,
8 'conditions':[ 8 'conditions':[
9 ['skia_android_framework == 1', { 9 ['skia_android_framework == 1', {
10 'use_system_libwebp': 1, 10 'use_system_libwebp': 1,
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 'libwebp_demux', 158 'libwebp_demux',
159 'libwebp_dsp', 159 'libwebp_dsp',
160 'libwebp_dsp_neon', 160 'libwebp_dsp_neon',
161 'libwebp_enc', 161 'libwebp_enc',
162 'libwebp_utils', 162 'libwebp_utils',
163 ], 163 ],
164 'direct_dependent_settings': { 164 'direct_dependent_settings': {
165 'include_dirs': [ 165 'include_dirs': [
166 '../third_party/externals/libwebp/src', 166 '../third_party/externals/libwebp/src',
167 ], 167 ],
168 'cflags': [ 168 'cflags': [ '-w' ],
169 '-Wno-unused-function', # In C++11 mode, we get this warning when including decode.h. 169 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
170 ]
171 }, 170 },
172 'conditions': [ 171 'conditions': [
173 ['OS!="win"', {'product_name': 'webp'}], 172 ['OS!="win"', {'product_name': 'webp'}],
174 ], 173 ],
175 }, 174 },
176 ], 175 ],
177 }, { 176 }, {
178 # use_system_libwep == 1 177 # use_system_libwep == 1
179 'targets': [ 178 'targets': [
180 { 179 {
(...skipping 22 matching lines...) Expand all
203 ], 202 ],
204 }, 203 },
205 }, 204 },
206 ], 205 ],
207 ], 206 ],
208 } 207 }
209 ], 208 ],
210 }], 209 }],
211 ], 210 ],
212 } 211 }
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698