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

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

Issue 9654001: Fix pkgconfig wrapper for 64 bits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « net/third_party/nss/ssl.gyp ('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) 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 'conditions': [ 7 'conditions': [
8 [ 'os_posix == 1 and OS != "mac" and OS != "android"', { 8 [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
9 # Maybe link to system .so once the security concerns are thought 9 # Maybe link to system .so once the security concerns are thought
10 # through, since we already use it due to GTK. 10 # through, since we already use it due to GTK.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 ['OS=="android"', { 83 ['OS=="android"', {
84 'toolsets': ['target', 'host'], 84 'toolsets': ['target', 'host'],
85 }], 85 }],
86 ], 86 ],
87 }, 87 },
88 ] 88 ]
89 }, { 89 }, {
90 'conditions': [ 90 'conditions': [
91 ['sysroot!=""', { 91 ['sysroot!=""', {
92 'variables': { 92 'variables': {
93 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)"', 93 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<( target_arch)"',
94 }, 94 },
95 }, { 95 }, {
96 'variables': { 96 'variables': {
97 'pkg-config': 'pkg-config' 97 'pkg-config': 'pkg-config'
98 }, 98 },
99 }], 99 }],
100 ], 100 ],
101 'targets': [ 101 'targets': [
102 { 102 {
103 'target_name': 'libpng', 103 'target_name': 'libpng',
(...skipping 15 matching lines...) Expand all
119 ], 119 ],
120 'libraries': [ 120 'libraries': [
121 '<!@(<(pkg-config) --libs-only-l libpng)', 121 '<!@(<(pkg-config) --libs-only-l libpng)',
122 ], 122 ],
123 }, 123 },
124 }, 124 },
125 ], 125 ],
126 }], 126 }],
127 ], 127 ],
128 } 128 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698