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

Side by Side Diff: build/linux/system.gyp

Issue 6975045: touch: Always expect XInput2 availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 5 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 | « base/message_pump_x.cc ('k') | chrome/browser/browser_main.cc » ('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) 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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 'type': 'settings', 257 'type': 'settings',
258 'conditions': [ 258 'conditions': [
259 ['_toolset=="target"', { 259 ['_toolset=="target"', {
260 'direct_dependent_settings': { 260 'direct_dependent_settings': {
261 'cflags': [ 261 'cflags': [
262 '<!@(<(pkg-config) --cflags x11)', 262 '<!@(<(pkg-config) --cflags x11)',
263 ], 263 ],
264 }, 264 },
265 'link_settings': { 265 'link_settings': {
266 'ldflags': [ 266 'ldflags': [
267 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11)', 267 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
268 ], 268 ],
269 'libraries': [ 269 'libraries': [
270 '<!@(<(pkg-config) --libs-only-l x11)', 270 '<!@(<(pkg-config) --libs-only-l x11 xi)',
271 ], 271 ],
272 }, 272 },
273 }], 273 }],
274 # When XInput2 is available (i.e. inputproto version is 2.0), the
275 # pkg-config command will succeed, so the output will be empty.
276 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', {
277 'direct_dependent_settings': {
278 'defines': [
279 'HAVE_XINPUT2',
280 ],
281 },
282 'link_settings': {
283 'ldflags': [
284 '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
285 ],
286 'libraries': [
287 '<!@(<(pkg-config) --libs-only-l xi)',
288 ],
289 }
290 }],
291 ], 274 ],
292 }, 275 },
293 { 276 {
294 'target_name': 'xext', 277 'target_name': 'xext',
295 'type': 'settings', 278 'type': 'settings',
296 'conditions': [ 279 'conditions': [
297 ['_toolset=="target"', { 280 ['_toolset=="target"', {
298 'direct_dependent_settings': { 281 'direct_dependent_settings': {
299 'cflags': [ 282 'cflags': [
300 '<!@(<(pkg-config) --cflags xext)', 283 '<!@(<(pkg-config) --cflags xext)',
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 ], 440 ],
458 'libraries': [ 441 'libraries': [
459 '<!@(<(pkg-config) --libs-only-l "ibus-1.0 >= <(ibus_min_version)" )', 442 '<!@(<(pkg-config) --libs-only-l "ibus-1.0 >= <(ibus_min_version)" )',
460 ], 443 ],
461 }, 444 },
462 }], 445 }],
463 ], 446 ],
464 }, 447 },
465 ], 448 ],
466 } 449 }
OLDNEW
« no previous file with comments | « base/message_pump_x.cc ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698