[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./INSTALL ./Makefile.am ./aut...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./INSTALL ./Makefile.am ./aut... |
|
Date: |
Thu, 19 Jan 2006 23:50:11 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/01/19 23:50:11
Modified files:
. : ChangeLog INSTALL Makefile.am autogen.sh
config.mk.in configure.ac
backend : Makefile.am gnash.cpp
doc : Makefile.am
doc/C : Makefile.am gnash.xml
libbase : Makefile.am
libgeometry : Makefile.am
macros : docbook.m4 firefox.m4 glibmm.m4 jpeg.m4
libXML++.m4 libXML.m4 libexe.m4 opengl.m4
png.m4 zlib.m4
plugin : Makefile.am plugin.cpp plugin.h
plugin/mozilla-sdk: Makefile.am npn_gate.cpp npp_gate.cpp
npplat.h pluginbase.h
server : Makefile.am gnash.h gstring.h impl.cpp impl.h
movie.cpp movie.h string.cpp textformat.cpp
textformat.h thread.h timers.cpp timers.h
xml.cpp xml.h xmlsocket.cpp xmlsocket.h
utilities : Makefile.am parser.cpp processor.cpp
Added files:
. : mkinstalldirs
Log message:
* utilities/Makefile.am: Link with AM_LDFLAGS.
* utilities/parser.cpp: Include config.h. Define gofast, goslow,
and nodelay.
* utilities/processor.cpp: Include config.h. Define gofast,
goslow, and nodelay.
* configure.ac: Look for mkinstalldirs. Remove test for GLUT, it's
not used anymore.
* doc/C/gnash.xml: Update copyright year.
* backend/gnash.cpp: Include config.h. Give default values to
gofast and goslow.
* backend/Makefile.am: Don't install compatibility_include.h.
* libbase/Makefile.am: Remove unused install hook.
* libgeometry/Makefile.am: Remove unused install hook.
* server/Makefile.am: Remove unused install hook.
* config.mk.in: Remove GLUT variable.
* All GPL'd Files: Update copyright year.
* macros/firefox.m4: Get the java and plugin flags from
$mconfig. Don't look for GLUT, it'sm not needed.
* plugin/Makefile.am: Add include paths for all the Gnash
directories and libxml2.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/INSTALL.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/autogen.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/config.mk.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/mkinstalldirs?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash.xml.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glibmm.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/jpeg.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML++.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libexe.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/opengl.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/png.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/zlib.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/npn_gate.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/npp_gate.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/npplat.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/pluginbase.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gnash.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gstring.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/string.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/textformat.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/textformat.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/thread.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/timers.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/timers.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/parser.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/processor.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.25 gnash/ChangeLog:1.26
--- gnash/ChangeLog:1.25 Sun Jan 8 18:56:27 2006
+++ gnash/ChangeLog Thu Jan 19 23:50:11 2006
@@ -1,3 +1,26 @@
+2006-01-19 Rob Savoye <address@hidden>
+
+ * utilities/Makefile.am: Link with AM_LDFLAGS.
+ * utilities/parser.cpp: Include config.h. Define gofast, goslow,
+ and nodelay.
+ * utilities/processor.cpp: Include config.h. Define gofast,
+ goslow, and nodelay.
+ * configure.ac: Look for mkinstalldirs. Remove test for GLUT, it's
+ not used anymore.
+ * doc/C/gnash.xml: Update copyright year.
+ * backend/gnash.cpp: Include config.h. Give default values to
+ gofast and goslow.
+ * backend/Makefile.am: Don't install compatibility_include.h.
+ * libbase/Makefile.am: Remove unused install hook.
+ * libgeometry/Makefile.am: Remove unused install hook.
+ * server/Makefile.am: Remove unused install hook.
+ * config.mk.in: Remove GLUT variable.
+ * All GPL'd Files: Update copyright year.
+ * macros/firefox.m4: Get the java and plugin flags from
+ $mconfig. Don't look for GLUT, it'sm not needed.
+ * plugin/Makefile.am: Add include paths for all the Gnash
+ directories and libxml2.
+
2006-01-08 Rob Savoye <address@hidden>
* configure.ac: Print out an error message if any of the critical
Index: gnash/INSTALL
diff -u gnash/INSTALL:1.1 gnash/INSTALL:1.2
--- gnash/INSTALL:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/INSTALL Thu Jan 19 23:50:11 2006
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004,
+2005, 2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.5 gnash/Makefile.am:1.6
--- gnash/Makefile.am:1.5 Tue Dec 27 03:12:33 2005
+++ gnash/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,4 +1,5 @@
-# Copyright (C) 2005 Free Software Foundation, Inc.
+#
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -25,7 +26,7 @@
# SUBDIRS += $(STD_DIRS)
# endif
-include_HEADERS = compatibility_include.h
+noinst_HEADERS = compatibility_include.h
install-doc:
@cd doc/C ; $(MAKE) install-doc
Index: gnash/autogen.sh
diff -u gnash/autogen.sh:1.2 gnash/autogen.sh:1.3
--- gnash/autogen.sh:1.2 Tue Dec 27 16:28:10 2005
+++ gnash/autogen.sh Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.4 gnash/backend/Makefile.am:1.5
--- gnash/backend/Makefile.am:1.4 Thu Jan 12 10:28:12 2006
+++ gnash/backend/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@
sound_handler_sdl.cpp \
gnash.cpp
-# gnash_LDADD = -lGL -lGLU
+gnash_LDADD = $(AM_LDFLAGS)
# gnash_DEPENDENCIES =
MUDFLAP_OPT = -fmudflap
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.3 gnash/backend/gnash.cpp:1.4
--- gnash/backend/gnash.cpp:1.3 Sat Jan 7 04:44:09 2006
+++ gnash/backend/gnash.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +16,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SDL.h"
#include "SDL_thread.h"
@@ -30,18 +34,17 @@
#include "tu_types.h"
#include "xmlsocket.h"
-bool gofast; // FIXME: this flag gets set based on
+#ifdef HAVE_LIBXML
+bool gofast = false; // FIXME: this flag gets set based on
// an XML message written using
// SendCommand(""). This way a movie
// can optimize it's own performance
// when needed,
-bool nodelay; // FIXME: this flag gets set based on
+bool nodelay = false; // FIXME: this flag gets set based on
// an XML message written using
// SendCommand(""). This way a movie
// can optimize it's own performance
// when needed,
-
-#ifdef HAVE_LIBXML
extern int xml_fd; // FIXME: this is the file descriptor
// from XMLSocket::connect(). This
// needs to be propogated up through
@@ -136,7 +139,7 @@
static tu_file*
file_opener(const char* url)
-// Callback function. This opens files for th library.
+// Callback function. This opens files for the library.
{
return new tu_file(url, "rb");
}
Index: gnash/config.mk.in
diff -u gnash/config.mk.in:1.1 gnash/config.mk.in:1.2
--- gnash/config.mk.in:1.1 Tue Dec 20 21:07:50 2005
+++ gnash/config.mk.in Thu Jan 19 23:50:11 2006
@@ -29,7 +29,6 @@
OPENGL_CFLAGS = @OPENGL_CFLAGS@
OPENGL_LIBS = @OPENGL_LIBS@
GLU_LIBS = @GLU_LIBS@
-GLUT_LIBS = @GLUT_LIBS@
LIBXML_CFLAGS = @LIBXML_CFLAGS@
LIBXML_LIBS = @LIBXML_LIBS@
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.12 gnash/configure.ac:1.13
--- gnash/configure.ac:1.12 Thu Jan 12 09:30:03 2006
+++ gnash/configure.ac Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
dnl These are required by automake
AM_INIT_AUTOMAKE(gnash, 0.7)
AM_MAINTAINER_MODE
+AM_MKINSTALLDIRS
AC_PROG_MAKE_SET
dnl Use the POSIX Threads library, if specified.
@@ -324,14 +325,14 @@
nogo=true
fi
- if test x"$GLUT_LIBS" != x; then
- echo " GLUT flags are: $GLUT_CFLAGS"
- echo " GLUT libs are: $GLUT_LIBS"
- else
- echo " ERROR: No GLUT development package installed."
- echo " This is needed for the browser plugin."
- nogo=true
- fi
+dnl if test x"$GLUT_LIBS" != x; then
+dnl echo " GLUT flags are: $GLUT_CFLAGS"
+dnl echo " GLUT libs are: $GLUT_LIBS"
+dnl else
+dnl echo " ERROR: No GLUT development package installed."
+dnl echo " This is needed for the browser plugin."
+dnl nogo=true
+dnl fi
fi
# If anything critical is missing, don't bother to continue
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.1 gnash/doc/C/Makefile.am:1.2
--- gnash/doc/C/Makefile.am:1.1 Tue Dec 20 20:52:15 2005
+++ gnash/doc/C/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this fillocatee with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Index: gnash/doc/C/gnash.xml
diff -u gnash/doc/C/gnash.xml:1.6 gnash/doc/C/gnash.xml:1.7
--- gnash/doc/C/gnash.xml:1.6 Tue Dec 27 19:20:19 2005
+++ gnash/doc/C/gnash.xml Thu Jan 19 23:50:11 2006
@@ -19,7 +19,7 @@
<articleinfo>
<title>&app; Manual V&manrevision;</title>
<copyright>
- <year>2005</year>
+ <year>2005, 2006</year>
<holder>Rob Savoye</holder>
</copyright>
<!-- translators: uncomment this:
@@ -38,7 +38,7 @@
</publisher>
<!--
- Copyright (c) 2005, Free Software Foundation, Inc.
+ Copyright (c) 2005, 2006, Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
Index: gnash/doc/Makefile.am
diff -u gnash/doc/Makefile.am:1.2 gnash/doc/Makefile.am:1.3
--- gnash/doc/Makefile.am:1.2 Tue Dec 27 03:12:33 2005
+++ gnash/doc/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.5 gnash/libbase/Makefile.am:1.6
--- gnash/libbase/Makefile.am:1.5 Wed Jan 4 19:57:55 2006
+++ gnash/libbase/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
AM_CXXFLAGS = $(SDL_CFLAGS) $(INCLUDES)
AM_CPPFLAGS = -Wall
-AM_LDFLAGS = $(OPENGL_LIBS) $(GLU_LIBS) $(SDL_LIBS)
+# AM_LDFLAGS = $(OPENGL_LIBS) $(GLU_LIBS) $(SDL_LIBS)
lib_LTLIBRARIES = libbase.la
@@ -90,29 +90,6 @@
#libbase_la_LDFLAGS = -module -avoid-version -no-undefined
#libbase_la_LIBDADD = address@hidden@ # $(LIBLTDL)
-# These are basically copied from the Makefile.in produced by Automake.
-# Unfortunately the -local options for changing these don't work...
-# so we have to redefine them since we want to install with the package
-# name for our library and headers to avoid any problems. So the only
-# thing changes is includedir to pkgincludedir and libdir to pkglibdir.
-install-includeHEADERS:
- @$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
-
-uninstall-includeHEADERS: uninstall-libLTLIBRARIES
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
-
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
Index: gnash/libgeometry/Makefile.am
diff -u gnash/libgeometry/Makefile.am:1.4 gnash/libgeometry/Makefile.am:1.5
--- gnash/libgeometry/Makefile.am:1.4 Sat Jan 7 04:44:09 2006
+++ gnash/libgeometry/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
AM_CXXFLAGS = $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
AM_CPPFLAGS = -Wall
-AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS)
+# AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS)
lib_LTLIBRARIES = libgeometry.la
@@ -63,29 +63,6 @@
#libgeometry_la_LDFLAGS = -module -avoid-version -no-undefined
#libgeometry_la_LIBDADD = address@hidden@ # $(LIBLTDL)
-# These are basically copied from the Makefile.in produced by Automake.
-# Unfortunately the -local options for changing these don't work...
-# so we have to redefine them since we want to install with the package
-# name for our library and headers to avoid any problems. So the only
-# thing changes is includedir to pkgincludedir and libdir to pkglibdir.
-install-includeHEADERS:
- @$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
-
-uninstall-includeHEADERS: uninstall-libLTLIBRARIES
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
-
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.3 gnash/macros/docbook.m4:1.4
--- gnash/macros/docbook.m4:1.3 Fri Jan 6 13:41:02 2006
+++ gnash/macros/docbook.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.5 gnash/macros/firefox.m4:1.6
--- gnash/macros/firefox.m4:1.5 Thu Jan 12 09:30:04 2006
+++ gnash/macros/firefox.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -68,15 +68,15 @@
else
AC_MSG_CHECKING(for Firefox/Mozilla SDK)
if test "x$FIREFOX_CFLAGS" = "x" ; then
- FIREFOX_CFLAGS=`$mconfig --cflags`
+ FIREFOX_CFLAGS=`$mconfig --cflags java plugin`
fi
if test "x$FIREFOX_LIBS" = "x" ; then
- FIREFOX_LIBS=`$mconfig --libs`
+ FIREFOX_LIBS=`$mconfig --libs java plugin`
fi
if test "x$FIREFOX_LIBS" != "x" ; then
- FIREFOX_DEFS=`$mconfig --defines`
+ FIREFOX_DEFS=`$mconfig --defines java plugin`
FIREFOX_PLUGINS=`echo $FIREFOX_LIBS | sed -e 's:-L::'`/plugins
fi
fi
@@ -86,12 +86,6 @@
AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support
available])
fi
- dnl Check for GLUT which is needed for the plugin
- AC_CHECK_HEADER(glut.h)
- AC_CHECK_LIB(glut, glutInit, GLUT_LIBS="-lglut")
- AC_SUBST(GLUT_CFLAGS)
- AC_SUBST(GLUT_LIBS)
-
AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
AC_SUBST(FIREFOX_CFLAGS)
Index: gnash/macros/glibmm.m4
diff -u gnash/macros/glibmm.m4:1.1 gnash/macros/glibmm.m4:1.2
--- gnash/macros/glibmm.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/glibmm.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/jpeg.m4
diff -u gnash/macros/jpeg.m4:1.1 gnash/macros/jpeg.m4:1.2
--- gnash/macros/jpeg.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/jpeg.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/libXML++.m4
diff -u gnash/macros/libXML++.m4:1.1 gnash/macros/libXML++.m4:1.2
--- gnash/macros/libXML++.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/libXML++.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.5 gnash/macros/libXML.m4:1.6
--- gnash/macros/libXML.m4:1.5 Tue Dec 27 16:19:27 2005
+++ gnash/macros/libXML.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/libexe.m4
diff -u gnash/macros/libexe.m4:1.1 gnash/macros/libexe.m4:1.2
--- gnash/macros/libexe.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/libexe.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/opengl.m4
diff -u gnash/macros/opengl.m4:1.3 gnash/macros/opengl.m4:1.4
--- gnash/macros/opengl.m4:1.3 Sun Jan 15 23:22:37 2006
+++ gnash/macros/opengl.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/png.m4
diff -u gnash/macros/png.m4:1.1 gnash/macros/png.m4:1.2
--- gnash/macros/png.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/png.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/macros/zlib.m4
diff -u gnash/macros/zlib.m4:1.1 gnash/macros/zlib.m4:1.2
--- gnash/macros/zlib.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/zlib.m4 Thu Jan 19 23:50:11 2006
@@ -1,6 +1,5 @@
-dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.1 gnash/plugin/Makefile.am:1.2
--- gnash/plugin/Makefile.am:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,25 +25,41 @@
INCLUDES = -I.. \
-I$(srcdir) \
+ -I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/libgeometry \
+ -I$(top_srcdir)/server \
-I$(srcdir)/mozilla-sdk \
+ $(LIBXML_CFLAGS) \
$(FIREFOX_CFLAGS) \
$(SDL_CFLAGS) \
+ $(SDL_MIXER_CFLAGS) \
$(X_CFLAGS)
-G_LIBS = -lX11 -lXi -lXmu -lglut -lGL -lGLU -lm
AM_CXXFLAGS = $(INCLUDES)
# XP_UNIX This needs to get defined for npapi.h on unix platforms.
# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
# api gets control.
AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
-AM_LDFLAGS = $(FIREFOX_LIBS) $(X_LIBS)
+AM_LDFLAGS = $(FIREFOX_LIBS) \
+ $(X_LIBS) -lX11 -lXi -lXmu \
+ $(SDL_LIBS) \
+ $(SDL_MIXER_LIBS) \
+ $(OPENGL_LIBS) \
+ $(LIBXML_LIBS) \
+ $(JPEG_LIBS) \
+ $(PNG_LIBS)
plugin_LTLIBRARIES = libgnash.la
noinst_HEADERS = plugin.h
libgnash_la_SOURCES = plugin.cpp
-libgnash_la_LIBADD = mozilla-sdk/libmozsdk.la $(SDL_LIBS) $(G_LIBS)
+libgnash_la_LIBADD = $(AM_LDFLAGS) \
+ mozilla-sdk/libmozsdk.la \
+ ../libbase/libbase.la \
+ ../libgeometry/libgeometry.la \
+ ../server/libserver.la
+
libgnash_la_DEPENDENCIES = mozilla-sdk/libmozsdk.la
install-pluginLTLIBRARIES: $(plugin_LIBRARIES)
Index: gnash/plugin/mozilla-sdk/Makefile.am
diff -u gnash/plugin/mozilla-sdk/Makefile.am:1.2
gnash/plugin/mozilla-sdk/Makefile.am:1.3
--- gnash/plugin/mozilla-sdk/Makefile.am:1.2 Wed Dec 21 02:16:45 2005
+++ gnash/plugin/mozilla-sdk/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Index: gnash/plugin/mozilla-sdk/npn_gate.cpp
diff -u gnash/plugin/mozilla-sdk/npn_gate.cpp:1.2
gnash/plugin/mozilla-sdk/npn_gate.cpp:1.3
--- gnash/plugin/mozilla-sdk/npn_gate.cpp:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/plugin/mozilla-sdk/npn_gate.cpp Thu Jan 19 23:50:11 2006
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/plugin/mozilla-sdk/npp_gate.cpp
diff -u gnash/plugin/mozilla-sdk/npp_gate.cpp:1.2
gnash/plugin/mozilla-sdk/npp_gate.cpp:1.3
--- gnash/plugin/mozilla-sdk/npp_gate.cpp:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/plugin/mozilla-sdk/npp_gate.cpp Thu Jan 19 23:50:11 2006
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/plugin/mozilla-sdk/npplat.h
diff -u gnash/plugin/mozilla-sdk/npplat.h:1.2
gnash/plugin/mozilla-sdk/npplat.h:1.3
--- gnash/plugin/mozilla-sdk/npplat.h:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/plugin/mozilla-sdk/npplat.h Thu Jan 19 23:50:11 2006
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/plugin/mozilla-sdk/pluginbase.h
diff -u gnash/plugin/mozilla-sdk/pluginbase.h:1.2
gnash/plugin/mozilla-sdk/pluginbase.h:1.3
--- gnash/plugin/mozilla-sdk/pluginbase.h:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/plugin/mozilla-sdk/pluginbase.h Thu Jan 19 23:50:11 2006
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.7 gnash/plugin/plugin.cpp:1.8
--- gnash/plugin/plugin.cpp:1.7 Thu Jan 12 09:30:05 2006
+++ gnash/plugin/plugin.cpp Thu Jan 19 23:50:11 2006
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -15,6 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "plugin.h"
#define MIME_TYPES_HANDLED "application/x-shockwave-flash"
// The name must be this value to get flash movies that check the
@@ -39,6 +43,14 @@
#include <sys/stat.h>
#include <fcntl.h>
+#include "gnash.h"
+#include "ogl.h"
+#include "utility.h"
+#include "container.h"
+#include "tu_file.h"
+#include "tu_types.h"
+#include "xmlsocket.h"
+
using namespace std;
// This is our SDL surface
@@ -74,6 +86,16 @@
// needs to be propogated up through
// the layers properly, but first I
// want to make sure it all works.
+bool gofast = false; // FIXME: this flag gets set based on
+ // an XML message written using
+ // SendCommand(""). This way a movie
+ // can optimize it's own performance
+ // when needed,
+bool nodelay = false; // FIXME: this flag gets set based on
+ // an XML message written using
+ // SendCommand(""). This way a movie
+ // can optimize it's own performance
+ // when needed.
#endif // HAVE_LIBXML
// lighting on/off (1 = on, 0 = off)
Index: gnash/plugin/plugin.h
diff -u gnash/plugin/plugin.h:1.1 gnash/plugin/plugin.h:1.2
--- gnash/plugin/plugin.h:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/plugin.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.4 gnash/server/Makefile.am:1.5
--- gnash/server/Makefile.am:1.4 Sat Jan 7 04:44:09 2006
+++ gnash/server/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@
text.cpp \
types.cpp
-include_HEADERS = \
+noinst_HEADERS = \
action.h \
button.h \
dlist.h \
@@ -88,29 +88,6 @@
#libserver_la_LDFLAGS = -module -avoid-version -no-undefined
#libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
-# These are basically copied from the Makefile.in produced by Automake.
-# Unfortunately the -local options for changing these don't work...
-# so we have to redefine them since we want to install with the package
-# name for our library and headers to avoid any problems. So the only
-# thing changes is includedir to pkgincludedir and libdir to pkglibdir.
-install-includeHEADERS:
- @$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
-
-uninstall-includeHEADERS: uninstall-libLTLIBRARIES
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
-
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
Index: gnash/server/gnash.h
diff -u gnash/server/gnash.h:1.1 gnash/server/gnash.h:1.2
--- gnash/server/gnash.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/gnash.h Thu Jan 19 23:50:11 2006
@@ -1,19 +1,38 @@
-// gnash.h -- Thatcher Ulrich <address@hidden> 2003
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// SWF (Shockwave Flash) player library. The info for this came from
-// http://www.openswf.org, the flashsource project, and swfparse.cpp
-
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
#ifndef GNASH_H
#define GNASH_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <ctype.h> // for poxy wchar_t
#include <stdarg.h> // for va_list arg to
movie_interface::call_method_args()
+// FIXME: The local usage of these constants should probably be renamed in this
+// file because they conflict with definitions in the system header files.
Luckily
+// they are used in files we don't need, so we should be able to safely
redefine
+// these here.
+#undef INVALID
+#undef ESCAPE
+
class tu_file;
class render_handler;
class weak_proxy; // forward decl; defined in base/smart_ptr.h
@@ -27,7 +46,6 @@
class tu_string;
class tu_stringi;
-
namespace gnash {
// Forward declarations.
struct action_buffer;
Index: gnash/server/gstring.h
diff -u gnash/server/gstring.h:1.1 gnash/server/gstring.h:1.2
--- gnash/server/gstring.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/gstring.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.5 gnash/server/impl.cpp:1.6
--- gnash/server/impl.cpp:1.5 Wed Jan 18 09:06:02 2006
+++ gnash/server/impl.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/impl.h
diff -u gnash/server/impl.h:1.1 gnash/server/impl.h:1.2
--- gnash/server/impl.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/impl.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/movie.cpp
diff -u gnash/server/movie.cpp:1.1 gnash/server/movie.cpp:1.2
--- gnash/server/movie.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/movie.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/movie.h
diff -u gnash/server/movie.h:1.1 gnash/server/movie.h:1.2
--- gnash/server/movie.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/movie.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/string.cpp
diff -u gnash/server/string.cpp:1.1 gnash/server/string.cpp:1.2
--- gnash/server/string.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/string.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/textformat.cpp
diff -u gnash/server/textformat.cpp:1.1 gnash/server/textformat.cpp:1.2
--- gnash/server/textformat.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/textformat.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/textformat.h
diff -u gnash/server/textformat.h:1.1 gnash/server/textformat.h:1.2
--- gnash/server/textformat.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/textformat.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/thread.h
diff -u gnash/server/thread.h:1.1 gnash/server/thread.h:1.2
--- gnash/server/thread.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/thread.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/timers.cpp
diff -u gnash/server/timers.cpp:1.1 gnash/server/timers.cpp:1.2
--- gnash/server/timers.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/timers.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/timers.h
diff -u gnash/server/timers.h:1.1 gnash/server/timers.h:1.2
--- gnash/server/timers.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/timers.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/xml.cpp
diff -u gnash/server/xml.cpp:1.1 gnash/server/xml.cpp:1.2
--- gnash/server/xml.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/xml.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/xml.h
diff -u gnash/server/xml.h:1.1 gnash/server/xml.h:1.2
--- gnash/server/xml.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/xml.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/server/xmlsocket.cpp
diff -u gnash/server/xmlsocket.cpp:1.2 gnash/server/xmlsocket.cpp:1.3
--- gnash/server/xmlsocket.cpp:1.2 Mon Dec 26 15:57:26 2005
+++ gnash/server/xmlsocket.cpp Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -54,12 +54,12 @@
int xml_fd = 0; // FIXME: This file descriptor is used by
// XML::checkSocket() when called from the main
// processing loop.
-extern bool gofast = false; // FIXME: this flag gets set based on
+extern bool gofast; // FIXME: this flag gets set based on
// an XML message written using
// SendCommand(""). This way a movie
// can optimize it's own performance
// when needed,
-extern bool nodelay = false; // FIXME: this flag gets set based on
+extern bool nodelay; // FIXME: this flag gets set based on
// an XML message written using
// SendCommand(""). This way a movie
// can optimize it's own performance
Index: gnash/server/xmlsocket.h
diff -u gnash/server/xmlsocket.h:1.1 gnash/server/xmlsocket.h:1.2
--- gnash/server/xmlsocket.h:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/xmlsocket.h Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.1 gnash/utilities/Makefile.am:1.2
--- gnash/utilities/Makefile.am:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/utilities/Makefile.am Thu Jan 19 23:50:11 2006
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,10 +25,8 @@
../libgeometry/libgeometry.la \
../server/libserver.la \
$(OPENGL_LIBS) \
- $(GLU_LIBS) \
$(SDL_LIBS) \
$(SDL_MIXER_LIBS) \
- $(LIB_DEBUG_FLAGS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(LIBXML_LIBS)
@@ -48,7 +46,8 @@
gprocessor_SOURCES = \
processor.cpp
-# gnash_LDADD =
+gparser_LDADD = $(AM_LDFLAGS)
+gprocessor_LDADD = $(AM_LDFLAGS)
# gnash_DEPENDENCIES =
MUDFLAP_OPT = -fmudflap
Index: gnash/utilities/parser.cpp
diff -u gnash/utilities/parser.cpp:1.1 gnash/utilities/parser.cpp:1.2
--- gnash/utilities/parser.cpp:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/utilities/parser.cpp Thu Jan 19 23:50:11 2006
@@ -5,6 +5,10 @@
// A program to parse SWF files into text output.
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "tu_file.h"
#include "zlib_adapter.h"
#include "image.h"
@@ -17,6 +21,25 @@
#define TWIPS_TO_PIXELS(x) ((x) / 20.f)
#define PIXELS_TO_TWIPS(x) ((x) * 20.f)
+bool gofast = false; // FIXME: this flag gets set based on
+ // an XML message written using
+ // SendCommand(""). This way a movie
+ // can optimize it's own performance
+ // when needed,
+bool nodelay = false; // FIXME: this flag gets set based on
+ // an XML message written using
+ // SendCommand(""). This way a movie
+ // can optimize it's own performance
+ // when needed,
+
+#ifdef HAVE_LIBXML
+extern int xml_fd; // FIXME: this is the file descriptor
+ // from XMLSocket::connect(). This
+ // needs to be propogated up through
+ // the layers properly, but first I
+ // want to make sure it all works.
+#endif // HAVE_LIBXML
+
using gnash::stream;
using gnash::log_msg;
Index: gnash/utilities/processor.cpp
diff -u gnash/utilities/processor.cpp:1.1 gnash/utilities/processor.cpp:1.2
--- gnash/utilities/processor.cpp:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/utilities/processor.cpp Thu Jan 19 23:50:11 2006
@@ -9,10 +9,34 @@
// original SWF files, so that we can more rapidly load those SWF
// files later.
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "tu_file.h"
#include "container.h"
#include "gnash.h"
+bool gofast = false; // FIXME: this flag gets set based on
+ // an XML message written using
+ // SendCommand(""). This way a movie
+ // can optimize it's own performance
+ // when needed,
+bool nodelay = false; // FIXME: this flag gets set based on
+ // an XML message written using
+ // SendCommand(""). This way a movie
+ // can optimize it's own performance
+ // when needed,
+
+#ifdef HAVE_LIBXML
+extern int xml_fd; // FIXME: this is the file descriptor
+ // from XMLSocket::connect(). This
+ // needs to be propogated up through
+ // the layers properly, but first I
+ // want to make sure it all works.
+#endif // HAVE_LIBXML
+
+
static bool s_verbose = false;
static void message_log(const char* message)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./INSTALL ./Makefile.am ./aut...,
Rob Savoye <=