diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-11-22 18:01:10 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2012-11-26 18:03:29 +0000 |
| commit | 4138b3141c2f39cddaea3d72bfc04342ed5092d0 (patch) | |
| tree | 14e360aca7ea86716b632269479f04c7bef4129e /cogl/cogl-depth-state.h | |
| parent | 8b1eabdc08da89a57792f9eb666e893a6cbb4e26 (diff) | |
| download | cogl-4138b3141c2f39cddaea3d72bfc04342ed5092d0.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>
Diffstat (limited to 'cogl/cogl-depth-state.h')
| -rw-r--r-- | cogl/cogl-depth-state.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cogl/cogl-depth-state.h b/cogl/cogl-depth-state.h index 072c6b0d..f9ecded8 100644 --- a/cogl/cogl-depth-state.h +++ b/cogl/cogl-depth-state.h @@ -31,7 +31,7 @@ #ifndef __COGL_DEPTH_STATE_H__ #define __COGL_DEPTH_STATE_H__ -G_BEGIN_DECLS +COGL_BEGIN_DECLS /** * SECTION:cogl-depth-state @@ -255,6 +255,6 @@ cogl_depth_state_get_range (CoglDepthState *state, float *near_val, float *far_val); -G_END_DECLS +COGL_END_DECLS #endif /* __COGL_DEPTH_STATE_H__ */ |