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

Side by Side Diff: libjpeg.gyp

Issue 8229006: Fix type 'settings' to 'none' in gyp file for libjpeg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: Created 9 years, 2 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 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', 7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
8 'conditions': [ 8 'conditions': [
9 [ 'chromeos==1 or OS=="freebsd" or OS=="openbsd"', { 9 [ 'chromeos==1 or OS=="freebsd" or OS=="openbsd"', {
10 # Link to system .so since we already use it due to GTK. 10 # Link to system .so since we already use it due to GTK.
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 }], 268 }],
269 ] 269 ]
270 }, 270 },
271 ], 271 ],
272 }, 272 },
273 ], 273 ],
274 }, { # else: use_system_libjpeg != 0 274 }, { # else: use_system_libjpeg != 0
275 'targets': [ 275 'targets': [
276 { 276 {
277 'target_name': 'libjpeg', 277 'target_name': 'libjpeg',
278 'type': 'settings', 278 'type': 'none',
279 'direct_dependent_settings': { 279 'direct_dependent_settings': {
280 'defines': [ 280 'defines': [
281 'USE_SYSTEM_LIBJPEG', 281 'USE_SYSTEM_LIBJPEG',
282 ], 282 ],
283 }, 283 },
284 'link_settings': { 284 'link_settings': {
285 'libraries': [ 285 'libraries': [
286 '-ljpeg', 286 '-ljpeg',
287 ], 287 ],
288 }, 288 },
289 }, 289 },
290 ], 290 ],
291 }], 291 }],
292 ], 292 ],
293 } 293 }
294 294
295 # Local Variables: 295 # Local Variables:
296 # tab-width:2 296 # tab-width:2
297 # indent-tabs-mode:nil 297 # indent-tabs-mode:nil
298 # End: 298 # End:
299 # vim: set expandtab tabstop=2 shiftwidth=2: 299 # 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