[clutter/clutter-1.16] build: Enable Cogl support with Wayland
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] build: Enable Cogl support with Wayland
- Date: Thu, 27 Jun 2013 15:58:02 +0000 (UTC)
commit 1fb0295ba162507fb798b2b7030f0f45ff252f27
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Jun 27 16:42:40 2013 +0100
build: Enable Cogl support with Wayland
The Wayland backend is based on Cogl, so we need to turn on the
SUPPORT_COGL flag to avoid breaking the build; this always went
unnoticed because we usually build the Wayland client backend
with the X11 backend.
Reported-by: Ross Burton <ross burton intel com>
configure.ac | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6779a88..5254704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,6 +316,7 @@ AS_IF([test "x$enable_wayland" = "xyes"],
experimental_backend="yes"
SUPPORT_WAYLAND=1
+ SUPPORT_COGL=1
PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0],
[
@@ -343,7 +344,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"],
[
PKG_CHECK_EXISTS([wayland-server],
[BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], [])
+
SUPPORT_WAYLAND_COMPOSITOR=1
+ SUPPORT_COGL=1
+
CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
#define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1"
AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support])
@@ -365,8 +369,8 @@ AS_IF([test "x$enable_cex100" = "xyes"],
experimental_backend="yes"
- SUPPORT_COGL=1
SUPPORT_CEX100=1
+ SUPPORT_COGL=1
have_gdl=no
AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]