isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-20 17:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

interactive/devices: Build unconditionally

Browse Source 
The test-devices interactive test does not rely on the X11 API being
present any more, after the introduction of the device manager API.
This commit is contained in:
Emmanuele Bassi 2011-10-17 16:06:15 +01:00
parent 8249e48802
commit 3b38cee66b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/interactive/Makefile.am
View File

@ -59,10 +59,11 @@ UNIT_TESTS = \
test-path-constraint.c \ test-path-constraint.c \
test-snap-constraint.c \ test-snap-constraint.c \
test-state-script.c \ test-state-script.c \
test-drop.c test-drop.c \
test-devices.c
if X11_TESTS if X11_TESTS
UNIT_TESTS += test-pixmap.c test-devices.c UNIT_TESTS += test-pixmap.c
endif endif
if OS_WIN32 if OS_WIN32

5
tests/interactive/test-devices.c
View File

@ -1,7 +1,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <gmodule.h> #include <gmodule.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#ifdef CLUTTER_WINDOWING_X11
#include <clutter/x11/clutter-x11.h> #include <clutter/x11/clutter-x11.h>
#endif
typedef struct { typedef struct {
ClutterActor *stage; ClutterActor *stage;
@ -218,8 +221,10 @@ test_devices_main (int argc, char **argv)
ClutterDeviceManager *manager; ClutterDeviceManager *manager;
const GSList *stage_devices, *l; const GSList *stage_devices, *l;
#ifdef CLUTTER_WINDOWING_X11
/* force enabling X11 support */ /* force enabling X11 support */
clutter_x11_enable_xinput (); clutter_x11_enable_xinput ();
#endif
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
return 1; return 1;