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

Fix up fruity flavour configure option.

Browse Source
This commit is contained in:
Richard Purdie 2008-05-01 15:28:56 +00:00
parent a628a7cf5c
commit 24e1448c65
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-05-01 Richard Purdie <rpurdie@openedhand.com>
* configure.ac:
Fix up fruity flavour configure option.
2008-05-01 Øyvind Kolås <pippin@o-hand.com> 2008-05-01 Øyvind Kolås <pippin@o-hand.com>
* clutter/cogl/gles/cogl-primitives.c: (_cogl_path_fill_nodes): draw * clutter/cogl/gles/cogl-primitives.c: (_cogl_path_fill_nodes): draw

14
configure.ac
View File

@ -116,6 +116,14 @@ AC_ARG_WITH([gles],
[Select Clutter GLES version (for EGL backends)]), [Select Clutter GLES version (for EGL backends)]),
glesversion=$with_gles) 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="" BACKEND_PC_FILES=""
# Check for X though could be redundant if backend does not need it. # Check for X though could be redundant if backend does not need it.
@ -222,6 +230,8 @@ case $glesversion in
GLES_LIBS="-lGLESv2 -lEGL" GLES_LIBS="-lGLESv2 -lEGL"
;; ;;
fruity)
;;
*) AC_MSG_ERROR([Invalid GL ES Version '$glesversion' specified]) *) AC_MSG_ERROR([Invalid GL ES Version '$glesversion' specified])
;; ;;
@ -338,10 +348,6 @@ case $clutterbackend in
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY" CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
AC_DEFINE([HAVE_CLUTTER_FRUITY], 1, [We're building a fruity version of the eglnative backend]) 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_LIBS="-ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit"
EGL_CFLAGS="" EGL_CFLAGS=""
;; ;;