isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Fix the missing COGL_HAS_GLES[12] defines

Browse Source 
In 7fae8ac051 the two cogl-defines.h files from GLES and GL were
unified. However this missed out the COGL_HAS_GLES[12] defines from
GLES. The configure.ac still made an AC_SUBST for the right version
but the replacement was never put in any headers. This fixes it so
that instead of directly calling AC_SUBST the value is now put into a
variable which later gets added to COGL_DEFINES so that it will end up
in cogl-defines.h
This commit is contained in:
Neil Roberts 2010-07-22 16:14:59 +01:00
parent d87b34f982
commit f17717717a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -363,6 +363,8 @@ dnl === COGL driver backend ====================================================
AS_IF([test "x$COGL_DRIVER" = "xgl"], AS_IF([test "x$COGL_DRIVER" = "xgl"],
[ AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering]) ]) [ AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering]) ])
cogl_gles_version_define=""
AS_IF([test "x$COGL_DRIVER" = "xgles"], AS_IF([test "x$COGL_DRIVER" = "xgles"],
[ [
@ -373,7 +375,7 @@ AS_IF([test "x$COGL_DRIVER" = "xgles"],
cogl_gl_headers="GLES/gl.h GLES/glext.h" cogl_gl_headers="GLES/gl.h GLES/glext.h"
AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering]) AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES1]) cogl_gles_version_define="COGL_HAS_GLES1"
PKG_CHECK_EXISTS([glesv1_cm], PKG_CHECK_EXISTS([glesv1_cm],
[BACKEND_PC_FILES="$BACKEND_PC_FILES glesv1_cm" [BACKEND_PC_FILES="$BACKEND_PC_FILES glesv1_cm"
@ -424,7 +426,7 @@ AS_IF([test "x$COGL_DRIVER" = "xgles"],
cogl_gl_headers="GLES2/gl2.h GLES2/gl2ext.h" cogl_gl_headers="GLES2/gl2.h GLES2/gl2ext.h"
use_gles2_wrapper=yes use_gles2_wrapper=yes
AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering]) AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering])
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES2]) cogl_gles_version_define="COGL_HAS_GLES2"
PKG_CHECK_EXISTS([glesv2], PKG_CHECK_EXISTS([glesv2],
[BACKEND_PC_FILES="$BACKEND_PC_FILES glesv2"], [BACKEND_PC_FILES="$BACKEND_PC_FILES glesv2"],
@ -456,7 +458,7 @@ AS_IF([test "x$COGL_DRIVER" = "xgles"],
[ [
cogl_gl_headers="GLES/gl.h GLES/glext.h" cogl_gl_headers="GLES/gl.h GLES/glext.h"
AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering]) AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES1]) cogl_gles_version_define="COGL_HAS_GLES1"
AC_CHECK_HEADERS([GLES/egl.h], AC_CHECK_HEADERS([GLES/egl.h],
[], [],
@ -493,7 +495,9 @@ AS_CASE([$COGL_DRIVER],
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GL"], COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GL"],
[gles], [gles],
[COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GLES" [COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GLES"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GLES"], COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GLES"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS $cogl_gles_version_define"
],
[AC_MSG_ERROR([Unknown cogl driver $COGL_DRIVER])]) [AC_MSG_ERROR([Unknown cogl driver $COGL_DRIVER])])
dnl Copy all of the words in COGL_DEFINES_SYMBOLS as separate #define dnl Copy all of the words in COGL_DEFINES_SYMBOLS as separate #define