Index: ui/aura/aura.gyp |
=================================================================== |
--- ui/aura/aura.gyp (revision 126124) |
+++ ui/aura/aura.gyp (working copy) |
@@ -14,6 +14,10 @@ |
'../../base/base.gyp:base', |
'../../base/base.gyp:base_i18n', |
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
+ #'../../build/linux/system.gyp:utouch_frame', |
+ #'../../build/linux/system.gyp:utouch_grail', |
+ '../../third_party/utouch-frame/utouch-frame.gyp:utouch-frame', |
+ '../../third_party/utouch-grail/utouch-grail.gyp:utouch-grail', |
'../../skia/skia.gyp:skia', |
'../gfx/compositor/compositor.gyp:compositor', |
'../ui.gyp:gfx_resources', |
@@ -62,15 +66,17 @@ |
'focus_manager.h', |
'gestures/gesture_configuration.cc', |
'gestures/gesture_configuration.h', |
- 'gestures/gesture_recognizer.h', |
- 'gestures/gesture_recognizer_aura.cc', |
+ 'gestures/gesture_point.cc', |
+ 'gestures/gesture_point.h', |
+ 'gestures/gesture_recognizer.h', |
+ 'gestures/gesture_recognizer_aura.cc', |
'gestures/gesture_recognizer_aura.h', |
- 'gestures/gesture_point.cc', |
- 'gestures/gesture_point.h', |
- 'gestures/velocity_calculator.cc', |
- 'gestures/velocity_calculator.h', |
- 'gestures/gesture_sequence.cc', |
- 'gestures/gesture_sequence.h', |
+ 'gestures/gesture_recognizer_grail.cc', |
+ 'gestures/gesture_recognizer_grail.h', |
+ 'gestures/gesture_sequence.cc', |
+ 'gestures/gesture_sequence.h', |
+ 'gestures/velocity_calculator.cc', |
+ 'gestures/velocity_calculator.h', |
'layout_manager.cc', |
'layout_manager.h', |
'root_window_host.h', |
@@ -100,6 +106,31 @@ |
['exclude', 'client/dispatcher_client.h'], |
], |
}], |
+ ['use_utouch==1', { |
+ 'sources!': [ |
+ 'gestures/gesture_point.cc', |
+ 'gestures/gesture_point.h', |
+ 'gestures/gesture_recognizer_aura.cc', |
+ 'gestures/gesture_recognizer_aura.h', |
+ 'gestures/gesture_sequence.cc', |
+ 'gestures/gesture_sequence.h', |
+ 'gestures/velocity_calculator.cc', |
+ 'gestures/velocity_calculator.h', |
+ ], |
+ 'defines': [ |
+ 'USE_UTOUCH', |
+ ], |
+ |
+ }, { #use_utouch!=1 |
+ 'dependencies!': [ |
+ '../../third_party/utouch-frame/utouch-frame.gyp:utouch-frame', |
+ '../../third_party/utouch-grail/utouch-grail.gyp:utouch-grail', |
+ ], |
+ 'sources!': [ |
+ 'gestures/gesture_recognizer_grail.cc', |
+ 'gestures/gesture_recognizer_grail.h', |
+ ], |
+ }], |
], |
}, |
{ |
@@ -179,6 +210,7 @@ |
'..', |
], |
'sources': [ |
+ 'gestures/gesture_recognizer_grail_unittest.cc', |
'gestures/gesture_recognizer_unittest.cc', |
'gestures/velocity_calculator_unittest.cc', |
'test/run_all_unittests.cc', |
@@ -198,6 +230,27 @@ |
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', |
], |
}], |
+ ['use_utouch==1', { |
+ 'sources!': [ |
+ 'gestures/gesture_recognizer_unittest.cc', |
+ 'gestures/velocity_calculator_unittest.cc', |
+ ], |
+ 'defines': [ |
+ 'USE_UTOUCH', |
+ ], |
+ 'dependencies': [ |
+# '../../build/linux/system.gyp:utouch_frame', |
+ '../../third_party/utouch-frame/utouch-frame.gyp:utouch-frame', |
+ '../../third_party/utouch-grail/utouch-grail.gyp:utouch-grail', |
+# '../../build/linux/system.gyp:utouch_grail', |
+ '../../third_party/xorg-gtest/xorg-gtest.gyp:xorg-gtest', |
+ ], |
+ }, # use_utouch != 1 |
+ { |
+ 'sources!': [ |
+ 'gestures/gesture_recognizer_grail_unittest.cc', |
+ ], |
+ }], |
], |
}, |
], |