CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/26 15:40:36
Modified files:
. : ChangeLog Makefile.am configure.ac
gui : Makefile.am Player.cpp gnash.cpp
Log message:
* Makefile.am, configure.ac, gui/Makefile.am:
Don't miss to list 'kde' as a gui when built as a side-effect
of enabling klash: fixes proper report of which GUI have been
compiled-in; Take first gui given to --enable-gui as the
default
one.
* gui/Player.cpp: don't force a default gui, take the one
defined
by build line (or default to nullGui).
* gui/gnash.cpp: print default gui from --version.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3834&r2=1.3835
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.368&r2=1.369
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.86&r2=1.87
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3834
retrieving revision 1.3835
diff -u -b -r1.3834 -r1.3835
--- ChangeLog 26 Jul 2007 14:40:41 -0000 1.3834
+++ ChangeLog 26 Jul 2007 15:40:35 -0000 1.3835
@@ -1,3 +1,14 @@
+2007-07-25 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * Makefile.am, configure.ac, gui/Makefile.am:
+ Don't miss to list 'kde' as a gui when built as a side-effect
+ of enabling klash: fixes proper report of which GUI have been
+ compiled-in; Take first gui given to --enable-gui as the default
+ one.
+ * gui/Player.cpp: don't force a default gui, take the one defined
+ by build line (or default to nullGui).
+ * gui/gnash.cpp: print default gui from --version.
+
2007-07-26 Alexander Sack <[EMAIL PROTECTED]>
* server/asobj/NetStreamGst.cpp: Don't use a variable before it
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- Makefile.am 24 Jul 2007 22:32:33 -0000 1.81
+++ Makefile.am 26 Jul 2007 15:40:35 -0000 1.82
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.81 2007/07/24 22:32:33 strk Exp $
+# $Id: Makefile.am,v 1.82 2007/07/26 15:40:35 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -219,7 +219,7 @@
@echo "Configurable options are:"
@echo "Media handler: $(MEDIA_CONFIG)"
@echo "Renderer engine: $(RENDERER_CONFIG)"
- @echo "GUI: $(GUI_CONFIG)"
+ @echo "Supported GUI: $(GUI_CONFIG) ( default $(DEFAULT_GUI) )"
# @echo "Extensions: "
check: check-recursive anal
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- configure.ac 26 Jul 2007 04:05:50 -0000 1.368
+++ configure.ac 26 Jul 2007 15:40:35 -0000 1.369
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.368 2007/07/26 04:05:50 strk Exp $
+dnl $Id: configure.ac,v 1.369 2007/07/26 15:40:35 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -953,6 +953,7 @@
kde=yes
qt=yes
build_kde=yes
+ addgui="${addgui},kde"
GNASH_PATH_KDE
GNASH_PATH_QT
fi
@@ -1293,6 +1294,8 @@
AC_SUBST(RENDERER_CONFIG)
GUI_CONFIG=${addgui}
AC_SUBST(GUI_CONFIG)
+DEFAULT_GUI=`echo "${GUI_CONFIG}" | cut -d',' -f1`
+AC_SUBST(DEFAULT_GUI)
MEDIA_CONFIG=${media_handler}
AC_SUBST(MEDIA_CONFIG)
@@ -1422,7 +1425,7 @@
if test x"$extensions_list" != x; then
echo " Building extensions: ${extensions_list}"
fi
-echo " GUI toolkits supported: ${addgui}"
+echo " GUI toolkits supported: ${GUI_CONFIG} (default gui:
${DEFAULT_GUI})"
echo " Renderers supported: ${add_renderer}"
echo " Media handler: "$media_handler
if test x"$media_handler" = xffmpeg -o x"$media_handler" = xmad; then
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- gui/Makefile.am 26 Jul 2007 14:39:09 -0000 1.88
+++ gui/Makefile.am 26 Jul 2007 15:40:35 -0000 1.89
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.88 2007/07/26 14:39:09 strk Exp $
+# $Id: Makefile.am,v 1.89 2007/07/26 15:40:35 strk Exp $
AUTOMAKE_OPTIONS = -Wno-portability
@@ -429,7 +429,7 @@
AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
AM_CPPFLAGS += -DRENDERER_CONFIG=\"$(RENDERER_CONFIG)\"
-AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\"
+AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\" -DDEFAULT_GUI=\"$(DEFAULT_GUI)\"
AM_CPPFLAGS += -DMEDIA_CONFIG=\"$(MEDIA_CONFIG)\"
AM_CPPFLAGS += -DTARGET_CONFIG=\"$(target)\"
AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat .configline)\""
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- gui/Player.cpp 26 Jul 2007 14:39:09 -0000 1.60
+++ gui/Player.cpp 26 Jul 2007 15:40:35 -0000 1.61
@@ -21,32 +21,8 @@
#include "config.h"
#endif
-#ifdef GUI_GTK
-# define DEFAULT_GUI guiGTK
-#endif
-
-#ifdef GUI_SDL
-# define DEFAULT_GUI guiSDL
-#endif
-
-#ifdef GUI_AQUA
-# define DEFAULT_GUI guiAQUA
-#endif
-
-#ifdef GUI_RISCOS
-# define DEFAULT_GUI guiRISCOS
-#endif
-
-#ifdef GUI_FLTK
-# define DEFAULT_GUI guiFLTK
-#endif
-
-#ifdef GUI_KDE
-# define DEFAULT_GUI guiKDE
-#endif
-
-#ifdef GUI_FB
-# define DEFAULT_GUI guiFB
+#ifndef DEFAULT_GUI
+# define DEFAULT_GUI guiNull
#endif
#include "gui.h"
@@ -112,7 +88,7 @@
#ifdef GNASH_FPS_DEBUG
,_fpsDebugTime(0.0)
#endif
- ,_guiFlavor(DEFAULT_GUI)
+ ,_guiFlavor(parseGuiFlavorByName(DEFAULT_GUI))
{
init();
}
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- gui/gnash.cpp 26 Jul 2007 05:14:54 -0000 1.86
+++ gui/gnash.cpp 26 Jul 2007 15:40:35 -0000 1.87
@@ -169,10 +169,10 @@
{
printf (_("Build options %s\n"
" Target: %s\n"
- " Renderer: %s GUI: %s Media handler: %s\n"
+ " Renderer: %s - GUI: %s (default %s) - Media handler: %s\n"
" Configured with: %s\n"),
VERSION, TARGET_CONFIG, RENDERER_CONFIG, GUI_CONFIG,
- MEDIA_CONFIG, CONFIG_CONFIG);
+ DEFAULT_GUI, MEDIA_CONFIG, CONFIG_CONFIG);
#ifdef HAVE_FFMPEG_AVCODEC_H
printf(_("Ffmpeg version is: %s\n"), LIBAVCODEC_IDENT);
#endif
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
