[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 692eb4829dec11140a38
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 692eb4829dec11140a38ec3371d97dd502b0540c |
Date: |
Fri, 03 Dec 2010 11:53:40 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 692eb4829dec11140a38ec3371d97dd502b0540c (commit)
from 5b7c0de2385f5b9d6fbc40cef6447aaebae67d00 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=692eb4829dec11140a38ec3371d97dd502b0540c
commit 692eb4829dec11140a38ec3371d97dd502b0540c
Author: Petter Reinholdtsen <address@hidden>
Date: Fri Dec 3 12:53:09 2010 +0100
Implement auto/yes/no semantic for OGL renderer
diff --git a/configure.ac b/configure.ac
index 1c10634..e783e2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -907,10 +907,10 @@ input_events=
dnl By default, we want to to build all renderers
build_ovg=no
build_gles=no
-build_ogl=yes
+build_ogl=auto
build_agg=yes
build_cairo=yes
-renderer_list="OpenGL AGG Cairo"
+renderer_list="AGG Cairo"
nrender=3
AC_ARG_ENABLE(renderer,
AC_HELP_STRING([--enable-renderer=], [Enable support for the specified
renderers (ogl|gles|cairo|agg|all, default=all)]),
@@ -1060,6 +1060,18 @@ if test x$pixelformat = xall; then
fi
fi
+if test x"${build_ogl}" != xno; then # yes or auto
+ GNASH_PATH_OPENGL
+ if test x"${build_ogl}" = xauto; then
+ if test xyes = x"${has_opengl}"; then
+ build_ogl=yes
+ renderer_list="${renderer_list} OpenGL"
+ else
+ build_ogl=no
+ fi
+ fi
+fi
+
AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x$build_ovg = xyes ])
AM_CONDITIONAL(BUILD_GLES_RENDERER, [ test x$build_gles = xyes ])
AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes])
@@ -2413,10 +2425,6 @@ if test x"${build_ogv}" = xyes; then
GNASH_PKG_FIND(OpenVG, [vg/openvg.h], [OpenVG library], vgDrawImage)
fi
-if test x"${build_ogl}" = xyes; then
- GNASH_PATH_OPENGL
-fi
-
if test x"${build_gtk}" = xyes; then
AC_ARG_ENABLE(ghelp,
AC_HELP_STRING([--enable-ghelp], [Enable support for the GNOME help
system]),
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 692eb4829dec11140a38ec3371d97dd502b0540c,
Sandro Santilli <=