From 67014764c9be1cdd393116292611b5835f45fb0d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 15 Jun 2009 10:48:56 +0100 Subject: [PATCH] Disable single header inclusion for GLib In order to be ready for the next major version of GLib we need to disable single header inclusion by using the G_DISABLE_SINGLE_INCLUDES define in the build process. --- common/Makefile.am | 1 + gl/Makefile.am | 1 + gles/Makefile.am | 1 + 3 files changed, 3 insertions(+) diff --git a/common/Makefile.am b/common/Makefile.am index 7a7dd8232..15fb295fa 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -13,6 +13,7 @@ INCLUDES = \ -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ -I$(top_builddir)/clutter \ -I$(top_builddir)/clutter/cogl \ + -DG_DISABLE_SINGLE_INCLUDES \ -DG_LOG_DOMAIN=\"Cogl-Common\" \ -DCLUTTER_COMPILATION diff --git a/gl/Makefile.am b/gl/Makefile.am index 1aab5b649..7864a4aee 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -42,6 +42,7 @@ INCLUDES = \ -I$(top_srcdir)/clutter \ -I$(top_builddir)/clutter \ -I$(top_builddir)/clutter/cogl \ + -DG_DISABLE_SINGLE_INCLUDES \ -DG_LOG_DOMAIN=\"Cogl-GL\" \ -DCLUTTER_COMPILATION diff --git a/gles/Makefile.am b/gles/Makefile.am index 3ce5365a7..6d17a6c6e 100644 --- a/gles/Makefile.am +++ b/gles/Makefile.am @@ -24,6 +24,7 @@ INCLUDES = \ -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ -I$(top_builddir)/clutter \ -I$(top_builddir)/clutter/cogl \ + -DG_DISABLE_SINGLE_INCLUDES \ -DG_LOG_DOMAIN=\"Cogl-GLES\" \ -DCLUTTER_COMPILATION