From 4f6fe6f0e2d1b786bd3dcc4c1b5f722d6aa5b359 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 22 Nov 2012 18:01:10 +0000 Subject: Fixes for --disable-glib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 4138b3141c2f39cddaea3d72bfc04342ed5092d0) --- cogl/cogl-egl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cogl/cogl-egl.h') diff --git a/cogl/cogl-egl.h b/cogl/cogl-egl.h index c9ca7865..420a99eb 100644 --- a/cogl/cogl-egl.h +++ b/cogl/cogl-egl.h @@ -28,7 +28,7 @@ #include "cogl-egl-defines.h" -G_BEGIN_DECLS +COGL_BEGIN_DECLS #define NativeDisplayType EGLNativeDisplayType #define NativeWindowType EGLNativeWindowType @@ -53,7 +53,7 @@ G_BEGIN_DECLS EGLDisplay cogl_egl_context_get_egl_display (CoglContext *context); -G_END_DECLS +COGL_END_DECLS #endif /* COGL_HAS_EGL_SUPPORT */ -- cgit v1.2.1