diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-11-22 18:01:10 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-01-22 17:48:05 +0000 |
| commit | 4f6fe6f0e2d1b786bd3dcc4c1b5f722d6aa5b359 (patch) | |
| tree | 146e84aac4bfe8a110eb8f88fda99037da18fab3 /cogl/cogl-pipeline-state.h | |
| parent | 5c8eebb3d9e38776642d0802074293f2fd93c5d6 (diff) | |
| download | cogl-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-state.h')
| -rw-r--r-- | cogl/cogl-pipeline-state.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl-pipeline-state.h index 9915e628..2f361cb7 100644 --- a/cogl/cogl-pipeline-state.h +++ b/cogl/cogl-pipeline-state.h @@ -31,9 +31,8 @@ #include <cogl/cogl-pipeline.h> #include <cogl/cogl-color.h> #include <cogl/cogl-depth-state.h> -#include <glib.h> -G_BEGIN_DECLS +COGL_BEGIN_DECLS #ifdef COGL_ENABLE_EXPERIMENTAL_API @@ -915,6 +914,6 @@ cogl_pipeline_add_snippet (CoglPipeline *pipeline, #endif /* COGL_ENABLE_EXPERIMENTAL_API */ -G_END_DECLS +COGL_END_DECLS #endif /* __COGL_PIPELINE_STATE_H__ */ |