Build with merged mutter/clutter/cogl

https://bugzilla.gnome.org/show_bug.cgi?id=760439
2016-04-09 19:02:17 +02:00
parent 1883df2927
commit af28a219be
3 changed files with 5 additions and 7 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -12,7 +12,7 @@ SUBDIRS = gvc

 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(MUTTER_TYPELIB_DIR)

 typelibdir = $(pkglibdir)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -18,7 +18,6 @@
 #include <X11/extensions/Xfixes.h>
 #include <canberra.h>
 #include <canberra-gtk.h>
-#include <clutter/glx/clutter-glx.h>
 #include <clutter/x11/clutter-x11.h>
 #include <gdk/gdkx.h>
 #include <gio/gio.h>