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

Side by Side Diff: third_party/libpng/libpng.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/libjpeg/libjpeg.gyp ('k') | third_party/libwebp/libwebp.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_libpng%': 1, 10 'use_system_libpng%': 1,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 }, 84 },
85 }, { 85 }, {
86 'variables': { 86 'variables': {
87 'pkg-config': 'pkg-config' 87 'pkg-config': 'pkg-config'
88 }, 88 },
89 }], 89 }],
90 ], 90 ],
91 'targets': [ 91 'targets': [
92 { 92 {
93 'target_name': 'libpng', 93 'target_name': 'libpng',
94 'type': 'settings', 94 'type': 'none',
95 'dependencies': [ 95 'dependencies': [
96 '../zlib/zlib.gyp:zlib', 96 '../zlib/zlib.gyp:zlib',
97 ], 97 ],
98 'direct_dependent_settings': { 98 'direct_dependent_settings': {
99 'cflags': [ 99 'cflags': [
100 '<!@(<(pkg-config) --cflags libpng)', 100 '<!@(<(pkg-config) --cflags libpng)',
101 ], 101 ],
102 'defines': [ 102 'defines': [
103 'USE_SYSTEM_LIBPNG', 103 'USE_SYSTEM_LIBPNG',
104 ], 104 ],
105 }, 105 },
106 'link_settings': { 106 'link_settings': {
107 'ldflags': [ 107 'ldflags': [
108 '<!@(<(pkg-config) --libs-only-L --libs-only-other libpng)', 108 '<!@(<(pkg-config) --libs-only-L --libs-only-other libpng)',
109 ], 109 ],
110 'libraries': [ 110 'libraries': [
111 '<!@(<(pkg-config) --libs-only-l libpng)', 111 '<!@(<(pkg-config) --libs-only-l libpng)',
112 ], 112 ],
113 }, 113 },
114 }, 114 },
115 ], 115 ],
116 }], 116 }],
117 ], 117 ],
118 } 118 }
OLDNEW
« no previous file with comments | « third_party/libjpeg/libjpeg.gyp ('k') | third_party/libwebp/libwebp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698