diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 13:52:40 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 13:52:40 +0000 |
| commit | 942ccff050a7c6aeb24d0511b298737841366fd4 (patch) | |
| tree | 2e54eae5fa3f8f921074b42cbcc7a26055100828 /build/linux/system.gyp | |
| parent | 34c06e64e4f1a12d223616bae57862a060327efd (diff) | |
| download | chromium_src-942ccff050a7c6aeb24d0511b298737841366fd4.zip chromium_src-942ccff050a7c6aeb24d0511b298737841366fd4.tar.gz chromium_src-942ccff050a7c6aeb24d0511b298737841366fd4.tar.bz2 | |
touch: Always expect XInput2 availability.
BUG=80790
TEST=touch compiles
Review URL: http://codereview.chromium.org/6975045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux/system.gyp')
| -rw-r--r-- | build/linux/system.gyp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 346fe22..d61ac62c 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)', - ], - } - }], ], }, { |