summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-09-15 14:39:29 +0100
committerRobert Bragg <robert@linux.intel.com>2012-09-24 16:04:17 +0100
commit67ad777099d62bdbc8515f6ee58ed80429cc6496 (patch)
tree7afc74f96dfede77578150bfc5290d2ed9b838f8
parent3abd3f0e1c325baf6cc2bd8bbdcdc0cab068455c (diff)
downloadcogl-67ad777099d62bdbc8515f6ee58ed80429cc6496.tar.gz
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>
-rw-r--r--cogl/cogl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cogl/cogl.c b/cogl/cogl.c
index 280b157e..ff9f66f4 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 ();