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

Side by Side Diff: libjpeg.gyp

Issue 6181005: Remove workaround for gyp issue 102 and use libjpeg_turbo on Linux.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'conditions': [ 8 'conditions': [
8 [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 9 ['chromeos==1 or OS=="freebsd" or OS=="openbsd"', {
9 # 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.
11 # See crbug.com/30288 and 31427 for why we skip OS=="linux" above.
10 'use_system_libjpeg%': 1, 12 'use_system_libjpeg%': 1,
11 }, { # OS!="linux" and OS!="freebsd" and OS!="openbsd" 13 }, { # chromeos!=1 and OS!="freebsd" and OS!="openbsd"
12 'use_system_libjpeg%': 0, 14 'use_system_libjpeg%': 0,
13 }], 15 }],
14 [ 'OS=="win"', { 16 [ 'OS=="win"', {
15 'object_suffix': 'obj', 17 'object_suffix': 'obj',
16 }, { 18 }, {
17 'object_suffix': 'o', 19 'object_suffix': 'o',
18 }], 20 }],
19 [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
20 # This is a workaround for GYP issue 102.
21 # TODO(hbono): Delete this workaround when this issue is fixed.
22 'shared_generated_dir': '<(INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
23 }, {
24 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_ turbo',
25 }],
26 ], 21 ],
27 }, 22 },
28 'conditions': [ 23 'conditions': [
29 [ 'use_system_libjpeg==0', { 24 [ 'use_system_libjpeg==0', {
30 'targets': [ 25 'targets': [
31 { 26 {
32 'target_name': 'libjpeg', 27 'target_name': 'libjpeg',
33 'type': '<(library)', 28 'type': '<(library)',
34 'include_dirs': [ 29 'include_dirs': [
35 '.', 30 '.',
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 ], 342 ],
348 }], 343 }],
349 ], 344 ],
350 } 345 }
351 346
352 # Local Variables: 347 # Local Variables:
353 # tab-width:2 348 # tab-width:2
354 # indent-tabs-mode:nil 349 # indent-tabs-mode:nil
355 # End: 350 # End:
356 # vim: set expandtab tabstop=2 shiftwidth=2: 351 # 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