[cogl/wip/cogl-1.14: 12/177] core: Don't initialize the GType system with --disable-glib
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-1.14: 12/177] core: Don't initialize the GType system with --disable-glib
- Date: Mon, 21 Jan 2013 15:45:57 +0000 (UTC)
commit 6322fdf50d6158e2914de7aafa24b82d16d72b14
Author: Damien Lespiau <damien lespiau intel com>
Date: Sat Sep 15 14:39:29 2012 +0100
core: Don't initialize the GType system with --disable-glib
--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.
Reviewed-by: Robert Bragg <robert linux intel com>
(cherry picked from commit 67ad777099d62bdbc8515f6ee58ed80429cc6496)
cogl/cogl.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/cogl/cogl.c b/cogl/cogl.c
index 5fd63fc..eda6efa 100644
--- a/cogl/cogl.c
+++ b/cogl/cogl.c
@@ -800,7 +800,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 ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]