touch: Always expect XInput2 availability.
BUG=80790 TEST=touch compiles Review URL: http://codereview.chromium.org/6975045 git-svn-id: http://src.chromium.org/svn/trunk/src/build@93621 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
0875ed0ff3
Коммит
8ea8c12835
|
@ -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)',
|
||||
],
|
||||
}
|
||||
}],
|
||||
],
|
||||
},
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче