summaryrefslogtreecommitdiff
path: root/cogl/cogl-pipeline-snippet-private.h
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2012-11-22 18:01:10 +0000
committerRobert Bragg <robert@linux.intel.com>2013-01-22 17:48:05 +0000
commit4f6fe6f0e2d1b786bd3dcc4c1b5f722d6aa5b359 (patch)
tree146e84aac4bfe8a110eb8f88fda99037da18fab3 /cogl/cogl-pipeline-snippet-private.h
parent5c8eebb3d9e38776642d0802074293f2fd93c5d6 (diff)
downloadcogl-4f6fe6f0e2d1b786bd3dcc4c1b5f722d6aa5b359.tar.gz
Fixes for --disable-glib
This fixes some problems which were stopping --disable-glib from working properly: • A lot of the public headers were including glib.h. This shouldn't be necessary because the API doesn't expose any glib types. Otherwise any apps would require glib in order to get the header. • The public headers were using G_BEGIN_DECLS. There is now a replacement macro called COGL_BEGIN_DECLS which is defined in cogl-types.h. • A similar fix has been done for G_GNUC_NULL_TERMINATED and G_GNUC_DEPRECATED. • The CFLAGS were not including $(builddir)/deps/glib which was preventing it finding the generated glibconfig.h when building out of tree. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 4138b3141c2f39cddaea3d72bfc04342ed5092d0)
Diffstat (limited to 'cogl/cogl-pipeline-snippet-private.h')
-rw-r--r--cogl/cogl-pipeline-snippet-private.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cogl/cogl-pipeline-snippet-private.h b/cogl/cogl-pipeline-snippet-private.h
index bfc9d5d4..b10b6ca6 100644
--- a/cogl/cogl-pipeline-snippet-private.h
+++ b/cogl/cogl-pipeline-snippet-private.h
@@ -28,6 +28,8 @@
#ifndef __COGL_PIPELINE_SNIPPET_PRIVATE_H
#define __COGL_PIPELINE_SNIPPET_PRIVATE_H
+#include <glib.h>
+
#include "cogl-snippet.h"
#include "cogl-queue.h"