brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl/configure.ac: make COGL_HAS_xyz defines public

Browse Source 
Instead of using AC_DEFINE for the various COGL_HAS_PLATFORM defines
this now adds them to the COGL_DEFINES_SYMBOLS variable which gets
substituted into the public cogl-defines.h header.
This commit is contained in:
Robert Bragg 2011-04-18 15:57:32 +01:00
parent c2631b2bf7
commit 27770b913f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/cogl/configure.ac
View File

@ -426,8 +426,7 @@ AS_IF([test "x$enable_null_egl_platform" = "xyes"],
NEED_EGL=yes NEED_EGL=yes
EGL_PLATFORMS="$EGL_PLATFORMS null" EGL_PLATFORMS="$EGL_PLATFORMS null"
AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT], [1], COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT"
[Cogl supports NULL EGL platform typedefs])
]) ])
AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL,
[test "x$enable_null_egl_platform" = "xyes"]) [test "x$enable_null_egl_platform" = "xyes"])
@ -475,8 +474,7 @@ AS_IF([test "x$enable_xlib_egl_platform" = "xyes"],
NEED_XLIB=yes NEED_XLIB=yes
EGL_PLATFORMS="$EGL_PLATFORMS xlib" EGL_PLATFORMS="$EGL_PLATFORMS xlib"
AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT], [1], COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT"
[Cogl supports Xlib based EGL platform typedefs])
]) ])
AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11,
[test "x$enable_xlib_egl_platform" = "xyes"]) [test "x$enable_xlib_egl_platform" = "xyes"])
@ -505,6 +503,7 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
) )
SUPPORT_EGL=yes SUPPORT_EGL=yes
GL_WINSYS_APIS="$GL_WINSYS_APIS egl" GL_WINSYS_APIS="$GL_WINSYS_APIS egl"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_SUPPORT"
]) ])
AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "xyes"]) AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "xyes"])
@ -520,11 +519,6 @@ AS_IF([test "x$NEED_XLIB" = "xyes"],
SUPPORT_X11=yes SUPPORT_X11=yes
SUPPORT_XLIB=yes SUPPORT_XLIB=yes
AC_DEFINE([COGL_HAS_X11_SUPPORT], [1],
[Cogl supports the X11 window system])
AC_DEFINE([COGL_HAS_XLIB_SUPPORT], [1],
[Cogl supports X11 using the Xlib API])
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11_SUPPORT"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_XLIB" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_XLIB"