[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac gui/fltk.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac gui/fltk.cpp |
Date: |
Sat, 11 Aug 2007 01:44:16 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/11 01:44:16
Modified files:
. : ChangeLog configure.ac
gui : fltk.cpp
Log message:
* configure.ac: abort if a requested renderer/gui combination
isn't supported (checked for gtk/kde/sdl/fb/fltk)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3992&r2=1.3993
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.398&r2=1.399
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.15&r2=1.16
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3992
retrieving revision 1.3993
diff -u -b -r1.3992 -r1.3993
--- ChangeLog 10 Aug 2007 22:53:22 -0000 1.3992
+++ ChangeLog 11 Aug 2007 01:44:15 -0000 1.3993
@@ -1,5 +1,10 @@
2007-08-10 Sandro Santilli <address@hidden>
+ * configure.ac: abort if a requested renderer/gui combination
+ isn't supported (checked for gtk/kde/sdl/fb/fltk)
+
+2007-08-10 Sandro Santilli <address@hidden>
+
* gui/Makefile.am: typo preventing gtk/cairo combination from building
* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
rid of the resources associated with a face.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -b -r1.398 -r1.399
--- configure.ac 10 Aug 2007 19:38:26 -0000 1.398
+++ configure.ac 11 Aug 2007 01:44:15 -0000 1.399
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.398 2007/08/10 19:38:26 strk Exp $
+dnl $Id: configure.ac,v 1.399 2007/08/11 01:44:15 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -329,9 +329,11 @@
dnl fi
if test x$build_ogl = xyes; then
-dnl if test x$build_fb = xyes -o x$build_fltk = xyes; then
- if test x$build_gtk != xyes -a x$build_sdl != xyes -a x$build_kde != xyes
-a x$build_aqua != xyes; then
- AC_MSG_ERROR([OpenGL renderer needs one of gtk,sdl or kde guis. Try
enabling any of them ( --enable-gui=gtk|kde|sdl ) or using AGG (
--enable-renderer=AGG ).]);
+ if test x$build_fb = xyes; then
+ AC_MSG_ERROR([OpenGL renderer is not supported by FB gui. Use
--enable-renderer=AGG]);
+ fi
+ if test x$build_fltk = xyes; then
+ AC_MSG_ERROR([OpenGL renderer is not supported by FLTK gui. Use
--enable-renderer=AGG]);
fi
AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
fi
@@ -1145,9 +1147,15 @@
dnl CAIRO_CFLAGS=`echo ${CAIRO_CFLAGS} | sed -e 's/ *//'`
dnl CAIRO_CFLAGS="${CAIRO_CFLAGS} ${CAIRO_CFLAGS}/cairo"
dnl fi
-dnl if test x$build_fb = xyes; then
-dnl AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
-dnl fi
+ if test x$build_fb = xyes; then
+ AC_MSG_ERROR([Cairo renderer is not supported by FB gui. Use
--enable-renderer=AGG]);
+ fi
+ if test x$build_fltk = xyes; then
+ AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use
--enable-renderer=AGG]);
+ fi
+ if test x$build_kde = xyes; then
+ AC_MSG_ERROR([Cairo renderer is not supported by KDE gui. Use
--enable-renderer=AGG]);
+ fi
AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
fi
Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/fltk.cpp 1 Jul 2007 10:54:00 -0000 1.15
+++ gui/fltk.cpp 11 Aug 2007 01:44:15 -0000 1.16
@@ -249,6 +249,9 @@
#elif defined(RENDERER_CAIRO)
#error FLTK/Cairo is currently broken. Please try again soon...
FltkCairoGlue _glue;
+#elif defined(RENDERER_OPENGL)
+#error FLTK/OpenGL is currently broken. Please try again soon...
+ FltkCairoGlue _glue;
#endif
createMenu();
end();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog configure.ac gui/fltk.cpp,
Sandro Santilli <=