diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 21:10:51 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 21:10:51 +0000 |
| commit | e9f575064ea212023b82ec27e36905a066cfc76d (patch) | |
| tree | d6f06303ee091acbe74fc31126067c20c2de1d44 /views/views.gyp | |
| parent | d9b5b3e38455a1ae06c02df6ebeace9dc9b79f42 (diff) | |
| download | chromium_src-e9f575064ea212023b82ec27e36905a066cfc76d.zip chromium_src-e9f575064ea212023b82ec27e36905a066cfc76d.tar.gz chromium_src-e9f575064ea212023b82ec27e36905a066cfc76d.tar.bz2 | |
touch: Allow grabbing/ungrabbing touch devices for XInput2.
This allows touch devices to be grabbed when events from the mouse/keyboard are
grabbed. This also exposes TouchFactory, which will eventually be used in more
places.
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71879
Review URL: http://codereview.chromium.org/6300007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 7cbcfe0..e9fb72b 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!': [ |