isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

egl-gdl: Correctly substitute COGL_CEX100_LIBGDL_PREFIX

Browse Source 
We weren't defining CLUTTER_CEX100_LIBGDL_PREFIX in the configure.ac and
thus failing to compile when selecting the EGL/GDL winsys. Take the
opportunity to rename that to COGL_CEX100_LIBGDL_PREFIX

https://bugzilla.gnome.org/show_bug.cgi?id=655355
This commit is contained in:
Damien Lespiau 2011-07-22 18:36:54 +03:00
parent f798e6e0c7
commit a53af153c3
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,6 +23,7 @@ stamp-marshal
*.gir *.gir
*.typelib *.typelib
/cogl/cogl-defines.h /cogl/cogl-defines.h
/cogl/cogl-display.h
/cogl/cogl-enum-types.c /cogl/cogl-enum-types.c
/cogl/cogl-enum-types.h /cogl/cogl-enum-types.h
config.* config.*

2
cogl/cogl-display.h → cogl/cogl-display.h.in
View File

@ -37,7 +37,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
#include <@CLUTTER_CEX100_LIBGDL_PREFIX@libgdl.h> #include <@COGL_CEX100_LIBGDL_PREFIX@libgdl.h>
#endif #endif
/** /**

7
configure.ac
View File

@ -652,9 +652,13 @@ AS_IF([test "x$enable_gdl_egl_platform" == "xyes"],
[ [
AC_CHECK_HEADERS( AC_CHECK_HEADERS(
[CE4100/libgdl.h], [CE4100/libgdl.h],
[COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100"], [
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100",
COGL_CEX100_LIBGDL_PREFIX=CE4100/
],
[AC_MSG_ERROR([libgdl.h not found])]) [AC_MSG_ERROR([libgdl.h not found])])
]) ])
AC_SUBST([COGL_CEX100_LIBGDL_PREFIX])
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT"
]) ])
@ -950,6 +954,7 @@ cogl/Makefile
cogl/cogl-1.0.pc cogl/cogl-1.0.pc
cogl/cogl-2.0-experimental.pc cogl/cogl-2.0-experimental.pc
cogl/cogl-defines.h cogl/cogl-defines.h
cogl/cogl-display.h
cogl-pango/Makefile cogl-pango/Makefile
cogl-pango/cogl-pango-1.0.pc cogl-pango/cogl-pango-1.0.pc
cogl-pango/cogl-pango-2.0-experimental.pc cogl-pango/cogl-pango-2.0-experimental.pc