brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for --disable-glib

Browse Source 
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)
This commit is contained in:
Neil Roberts
2012-11-22 18:01:10 +00:00
committed by Robert Bragg
parent 5c8eebb3d9
commit 4f6fe6f0e2
83 changed files with 195 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl-index-buffer.h
View File

@ -33,7 +33,7 @@
#include <cogl/cogl-context.h>
G_BEGIN_DECLS
COGL_BEGIN_DECLS
/**
* SECTION:cogl-index-buffer
@ -79,7 +79,7 @@ cogl_index_buffer_new (CoglContext *context,
CoglBool
cogl_is_index_buffer (void *object);
G_END_DECLS
COGL_END_DECLS
#endif /* __COGL_INDEX_BUFFER_H__ */