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

Unified Diff: views/views.gyp

Issue 6300007: touch: Allow grabbing/ungrabbing touch devices for XInput2. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: gyp blackmagic Created 9 years, 11 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 | « views/touchui/touch_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 7cbcfe0ad7e7a59e1ae529969e2dde5bf8de79af..e9fb72b0f526e0c491b826445c12eead194adeeb 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -6,6 +6,22 @@
'variables': {
'chromium_code': 1,
},
+
+ 'conditions': [
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ 'conditions': [
+ ['sysroot!=""', {
+ 'variables': {
+ 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
+ },
+ }, {
+ 'variables': {
+ 'pkg-config': 'pkg-config'
+ },
+ }],]
+ }],
+ ],
+
'target_defaults': {
'sources/': [
['exclude', '/(cocoa|gtk|win)/'],
@@ -281,6 +297,8 @@
'standard_layout.h',
'touchui/gesture_manager.cc',
'touchui/gesture_manager.h',
+ 'touchui/touch_factory.cc',
+ 'touchui/touch_factory.h',
'view.cc',
'view.h',
'view_constants.cc',
@@ -392,6 +410,15 @@
['exclude', 'focus/accelerator_handler_gtk.cc'],
['exclude', 'controls/menu/native_menu_gtk.cc'],
],
+ 'conditions': [
+ ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', {
+ # Exclude TouchFactory if XInput2 is not available.
+ 'sources/': [
+ ['exclude', 'touchui/touch_factory.cc'],
+ ['exclude', 'touchui/touch_factory.h'],
+ ],
+ }],
+ ],
}],
['OS=="win"', {
'sources!': [
« no previous file with comments | « views/touchui/touch_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698