From 24e1448c658bc5e4b677d9f5e32fdeac3d5ada4a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 1 May 2008 15:28:56 +0000 Subject: [PATCH] Fix up fruity flavour configure option. --- ChangeLog | 5 +++++ configure.ac | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85fc71844..59bc69cac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-01 Richard Purdie + + * configure.ac: + Fix up fruity flavour configure option. + 2008-05-01 Øyvind Kolås * clutter/cogl/gles/cogl-primitives.c: (_cogl_path_fill_nodes): draw diff --git a/configure.ac b/configure.ac index 3d2c17674..971a0675d 100644 --- a/configure.ac +++ b/configure.ac @@ -116,6 +116,14 @@ AC_ARG_WITH([gles], [Select Clutter GLES version (for EGL backends)]), glesversion=$with_gles) +if test "x$clutterbackend" = "xfruity" +then + if test "x$glesversion" != "x1.1"; then + AC_MSG_ERROR([Fruity backend only supports GL ES 1.1.]); + fi + glesversion="fruity" +fi + BACKEND_PC_FILES="" # Check for X though could be redundant if backend does not need it. @@ -222,6 +230,8 @@ case $glesversion in GLES_LIBS="-lGLESv2 -lEGL" ;; + fruity) + ;; *) AC_MSG_ERROR([Invalid GL ES Version '$glesversion' specified]) ;; @@ -338,10 +348,6 @@ case $clutterbackend in CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY" AC_DEFINE([HAVE_CLUTTER_FRUITY], 1, [We're building a fruity version of the eglnative backend]) - if test "x$glesversion" != "x1.1"; then - AC_MSG_ERROR([Fruity backend only supports GL ES 1.1.]); - fi - EGL_LIBS="-ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit" EGL_CFLAGS="" ;;