diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2011-08-01 17:20:43 +0300 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2011-08-01 16:36:52 +0100 |
| commit | ee01fd263a94a36467bc320f8436681b48945439 (patch) | |
| tree | f0a4ec03a7ca238508e097069a23c62303e6b8ff | |
| parent | 89426a802f4ee68e137268b0484690b9e2a895b8 (diff) | |
| download | cogl-ee01fd263a94a36467bc320f8436681b48945439.tar.gz | |
egl-gdl: Don't generate cogl-display.h
It's not necessary to generate cogl-display.h just for the GDL backend
and to change the inclusion of libgdl.h. We can just tweak the include
CFLAGS to put /usr/include/CE4100 in the search path when needed.
Previously this did not work because of a stay ',' at the end of the
COGL_EXTRA_CFLAGS int he configure.ac. This actually simplifies the
code, which is always good.
This also fixes out of tree builds.
https://bugzilla.gnome.org/show_bug.cgi?id=655724
Reviewed-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cogl/cogl-display.h (renamed from cogl/cogl-display.h.in) | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 3 insertions, 7 deletions
@@ -23,7 +23,6 @@ stamp-marshal *.gir *.typelib /cogl/cogl-defines.h -/cogl/cogl-display.h /cogl/cogl-enum-types.c /cogl/cogl-enum-types.h config.* diff --git a/cogl/cogl-display.h.in b/cogl/cogl-display.h index 11db8650..15f580ed 100644 --- a/cogl/cogl-display.h.in +++ b/cogl/cogl-display.h @@ -37,7 +37,7 @@ G_BEGIN_DECLS #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT -#include <@COGL_CEX100_LIBGDL_PREFIX@libgdl.h> +#include <libgdl.h> #endif /** diff --git a/configure.ac b/configure.ac index 5bb4980d..0efb9535 100644 --- a/configure.ac +++ b/configure.ac @@ -653,14 +653,12 @@ AS_IF([test "x$enable_gdl_egl_platform" == "xyes"], AC_CHECK_HEADERS( [CE4100/libgdl.h], [ - COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100", - COGL_CEX100_LIBGDL_PREFIX=CE4100/ + COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100" ], [AC_MSG_ERROR([libgdl.h not found])]) ]) - AC_SUBST([COGL_CEX100_LIBGDL_PREFIX]) - COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lgdl" + COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lgdl" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT" ]) @@ -956,7 +954,6 @@ cogl/Makefile cogl/cogl-1.0.pc cogl/cogl-2.0-experimental.pc cogl/cogl-defines.h -cogl/cogl-display.h cogl-pango/Makefile cogl-pango/cogl-pango-1.0.pc cogl-pango/cogl-pango-2.0-experimental.pc |