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

Side by Side Diff: third_party/libjpeg/libjpeg.gyp

Issue 7889051: Remove 'settings' type from gyp files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « third_party/expat/expat.gyp ('k') | third_party/libpng/libpng.gyp » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'conditions': [ 7 'conditions': [
8 [ 'os_posix == 1 and OS != "mac"', { 8 [ 'os_posix == 1 and OS != "mac"', {
9 # Link to system .so since we already use it due to GTK. 9 # Link to system .so since we already use it due to GTK.
10 'use_system_libjpeg%': 1, 10 'use_system_libjpeg%': 1,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 }, 82 },
83 'conditions': [ 83 'conditions': [
84 ['OS!="win"', {'product_name': 'jpeg'}], 84 ['OS!="win"', {'product_name': 'jpeg'}],
85 ], 85 ],
86 }, 86 },
87 ], 87 ],
88 }, { 88 }, {
89 'targets': [ 89 'targets': [
90 { 90 {
91 'target_name': 'libjpeg', 91 'target_name': 'libjpeg',
92 'type': 'settings', 92 'type': 'none',
93 'direct_dependent_settings': { 93 'direct_dependent_settings': {
94 'defines': [ 94 'defines': [
95 'USE_SYSTEM_LIBJPEG', 95 'USE_SYSTEM_LIBJPEG',
96 ], 96 ],
97 }, 97 },
98 'link_settings': { 98 'link_settings': {
99 'libraries': [ 99 'libraries': [
100 '-ljpeg', 100 '-ljpeg',
101 ], 101 ],
102 }, 102 },
103 } 103 }
104 ], 104 ],
105 }], 105 }],
106 ], 106 ],
107 } 107 }
OLDNEW
« no previous file with comments | « third_party/expat/expat.gyp ('k') | third_party/libpng/libpng.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698