[Cogl] [PATCH 4/8] core: Don't initialize the GType system with --disable-glib
Robert Bragg
robert at sixbynine.org
Tue Sep 18 07:29:49 PDT 2012
This looks good to land to me:
Reviewed-by: Robert Bragg <robert at linux.intel.com>
thanks,
- Robert
On Mon, Sep 17, 2012 at 8:08 PM, Damien Lespiau
<damien.lespiau at gmail.com> wrote:
> From: Damien Lespiau <damien.lespiau at intel.com>
>
> --disable-glib also defines COGL_HAS_GTYPE_SUPPORT to #ifdef out GType
> support in cogl. This also means we don't want to initialize glib's type
> system in that case.
> ---
> cogl/cogl.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/cogl/cogl.c b/cogl/cogl.c
> index 280b157..ff9f66f 100644
> --- a/cogl/cogl.c
> +++ b/cogl/cogl.c
> @@ -219,7 +219,9 @@ _cogl_init (void)
> bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR);
> bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
>
> +#ifdef COGL_HAS_GTYPE_SUPPORT
> g_type_init ();
> +#endif
>
> _cogl_config_read ();
> _cogl_debug_check_environment ();
> --
> 1.7.7.5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl
More information about the Cogl
mailing list