diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2012-09-15 14:39:29 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-01-22 17:47:24 +0000 |
| commit | eb92b512c6bc18d370264712985710a640edf795 (patch) | |
| tree | c332e81037842fc7b7032b5f6fbde081be8dd797 /cogl/cogl.c | |
| parent | 27fb2948872d873cd324f8b8f3b23d97046d0017 (diff) | |
| download | cogl-eb92b512c6bc18d370264712985710a640edf795.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>
(cherry picked from commit 67ad777099d62bdbc8515f6ee58ed80429cc6496)
Diffstat (limited to 'cogl/cogl.c')
| -rw-r--r-- | cogl/cogl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cogl/cogl.c b/cogl/cogl.c index 5fd63fc9..eda6efa5 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 (); |