[clutter/multi-backend: 21/22] interactive/devices: Always build



commit ae4a01001d86a44bdb826738ff3b947d6aa74d93
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Oct 17 16:06:15 2011 +0100

    interactive/devices: Always build
    
    The test-devices interactive test does not rely on the X11 API being
    present any more, after the introduction of the device manager API.

 tests/interactive/Makefile.am    |    5 +++--
 tests/interactive/test-devices.c |    5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index f384742..62c494b 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -59,10 +59,11 @@ UNIT_TESTS = \
 	test-path-constraint.c \
 	test-snap-constraint.c \
 	test-state-script.c \
-	test-drop.c
+	test-drop.c \
+	test-devices.c
 
 if X11_TESTS
-UNIT_TESTS += test-pixmap.c test-devices.c
+UNIT_TESTS += test-pixmap.c
 endif
 
 if OS_WIN32
diff --git a/tests/interactive/test-devices.c b/tests/interactive/test-devices.c
index 1d252dc..5473174 100644
--- a/tests/interactive/test-devices.c
+++ b/tests/interactive/test-devices.c
@@ -1,7 +1,10 @@
 #include <stdlib.h>
 #include <gmodule.h>
 #include <clutter/clutter.h>
+
+#ifdef CLUTTER_WINDOWING_X11
 #include <clutter/x11/clutter-x11.h>
+#endif
 
 typedef struct {
   ClutterActor *stage;
@@ -218,8 +221,10 @@ test_devices_main (int argc, char **argv)
   ClutterDeviceManager *manager;
   const GSList *stage_devices, *l;
 
+#ifdef CLUTTER_WINDOWING_X11
   /* force enabling X11 support */
   clutter_x11_enable_xinput ();
+#endif
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]