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

Unified Diff: build/linux/system.gyp

Issue 4186004: touchui: First pass at XInput2 message pump. (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: gyp fiddling Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/message_pump_glib_x.cc ('k') | views/event_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index cf25bb11f797cbd9e13e2d264b48188b685b414c..7193c67792f80d1e73c1aeabc979f7fdc58c3151 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',
« no previous file with comments | « base/message_pump_glib_x.cc ('k') | views/event_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698