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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/message_pump_x.cc ('k') | chrome/browser/browser_main.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 346fe22dab98ef73e645b3eec4f3f3b07e085d32..d61ac62cbab304d91f07471f630834b87992855f 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -264,30 +264,13 @@
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other x11)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l x11)',
+ '<!@(<(pkg-config) --libs-only-l x11 xi)',
],
},
}],
- # 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',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l xi)',
- ],
- }
- }],
],
},
{
« 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