summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 17:42:30 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 17:42:30 +0000
commit130eeb3f689593d7ab1601b867124b1fba176f0f (patch)
treeab68d59a1d70677414e450e119aef86f03f18dd2 /build
parent1571c12efd24612f9502e2fde5a823e4412886ea (diff)
downloadchromium_src-130eeb3f689593d7ab1601b867124b1fba176f0f.zip
chromium_src-130eeb3f689593d7ab1601b867124b1fba176f0f.tar.gz
chromium_src-130eeb3f689593d7ab1601b867124b1fba176f0f.tar.bz2
touchui: First pass at XInput2 message pump.
Capture X events using XInput2. BUG=None TEST=None Review URL: http://codereview.chromium.org/4186004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/linux/system.gyp12
1 files changed, 11 insertions, 1 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index cf25bb1..7193c67 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -225,7 +225,17 @@
'<!@(<(pkg-config) --libs-only-l x11)',
],
},
- }]]
+ }],
+ # When XInput2 is available (i.e. inputproto version is 2.0), the
+ # pkg-config command will succeed, so the output will be empty.
+ ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', {
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'HAVE_XINPUT2',
+ ],
+ },
+ }],
+ ],
},
{
'target_name': 'xext',