diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2012-09-17 02:20:10 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-09-24 16:04:17 +0100 |
| commit | de063914078c8717ddcbc5417f45e9efb4e3a6ea (patch) | |
| tree | 3ad6671fff567acb6a5e4d1e420cd5b10ed795ec /cogl-gles2 | |
| parent | 016f2276823a8a8cde33d3e7062c61469921a9f1 (diff) | |
| download | cogl-de063914078c8717ddcbc5417f45e9efb4e3a6ea.tar.gz | |
build: Allow to build cogl without an external glib dependency
This commit pushes --disable-glib to the extreme of embedding the par of
glib cogl depends on in tree to be able to generate a DSO that does not
depend on an external glib.
To do so, it:
- keeps a lot of glib's configure.ac in as-glibconfig.m4
- pulls the code cogl depends on and the necessary dependencies
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl-gles2')
| -rw-r--r-- | cogl-gles2/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am index 3ff62917..0052d0e2 100644 --- a/cogl-gles2/Makefile.am +++ b/cogl-gles2/Makefile.am @@ -7,8 +7,9 @@ NULL = lib_LTLIBRARIES = libcogl-gles2.la INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_builddir)/deps/glib AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) |