[cogl/wip/cogl-1.14: 14/177] config: Don't read a config file at startup when using --disable-glib
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-1.14: 14/177] config: Don't read a config file at startup when using --disable-glib
- Date: Mon, 21 Jan 2013 15:46:07 +0000 (UTC)
commit 322ec01085ab0405bee749641e1c99a3f4611a64
Author: Damien Lespiau <damien lespiau intel com>
Date: Sat Sep 15 15:55:16 2012 +0100
config: Don't read a config file at startup when using --disable-glib
GKeyFile is a bit too much to import in a standalone build for my taste
as it depends on the encoding part of glib.
Reviewed-by: Robert Bragg <robert linux intel com>
(cherry picked from commit 9af04f0d8813b7f6f7117e1cc2a38ae2b8d04cdd)
cogl/cogl-config.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/cogl/cogl-config.c b/cogl/cogl-config.c
index a000dd9..5731783 100644
--- a/cogl/cogl-config.c
+++ b/cogl/cogl-config.c
@@ -38,6 +38,16 @@ char *_cogl_config_renderer;
char *_cogl_config_disable_gl_extensions;
char *_cogl_config_override_gl_version;
+#ifndef COGL_HAS_GLIB_SUPPORT
+
+void
+_cogl_config_read (void)
+{
+
+}
+
+#else /* COGL_HAS_GLIB_SUPPORT */
+
/* Array of config options that just set a global string */
static const struct
{
@@ -127,3 +137,5 @@ _cogl_config_read (void)
g_key_file_free (key_file);
}
+
+#endif /* COGL_HAS_GLIB_SUPPORT */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]