[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./configure.ac backend/Makefile.am backen...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./configure.ac backend/Makefile.am backen... |
Date: |
Mon, 26 Dec 2005 15:57:27 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 05/12/26 15:57:26
Modified files:
. : configure.ac
backend : Makefile.am Makefile.in
plugin : plugin.cpp
server : impl.cpp xmlsocket.cpp
Log message:
* backend/gnash.cpp: Define gofast and goslow here instead of
xmlsocket.cpp.
* server/xmlsocket.cpp: Reference gofast and goslow as externs so
gnash actually builds with --disable-xml.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.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.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.1 gnash/backend/Makefile.am:1.2
--- gnash/backend/Makefile.am:1.1 Tue Dec 20 21:02:24 2005
+++ gnash/backend/Makefile.am Mon Dec 26 15:57:26 2005
@@ -46,7 +46,7 @@
gnash_SOURCES = \
render_handler_ogl.cpp \
sound_handler_sdl.cpp \
- test_ogl.cpp
+ gnash.cpp
# gnash_LDADD =
# gnash_DEPENDENCIES =
Index: gnash/backend/Makefile.in
diff -u gnash/backend/Makefile.in:1.2 gnash/backend/Makefile.in:1.3
--- gnash/backend/Makefile.in:1.2 Thu Dec 22 04:56:55 2005
+++ gnash/backend/Makefile.in Mon Dec 26 15:57:26 2005
@@ -76,7 +76,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_gnash_OBJECTS = render_handler_ogl.$(OBJEXT) \
- sound_handler_sdl.$(OBJEXT) test_ogl.$(OBJEXT)
+ sound_handler_sdl.$(OBJEXT) gnash.$(OBJEXT)
gnash_OBJECTS = $(am_gnash_OBJECTS)
gnash_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -260,7 +260,7 @@
gnash_SOURCES = \
render_handler_ogl.cpp \
sound_handler_sdl.cpp \
- test_ogl.cpp
+ gnash.cpp
# gnash_LDADD =
@@ -338,9 +338,9 @@
distclean-compile:
-rm -f *.tab.c
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo"
-c -o $@ $<; \
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.5 gnash/configure.ac:1.6
--- gnash/configure.ac:1.5 Sun Dec 25 20:38:42 2005
+++ gnash/configure.ac Mon Dec 26 15:57:26 2005
@@ -51,6 +51,7 @@
if test x$enable_xml != xno; then
AM_PATH_LIBXML2
fi
+AM_CONDITIONAL(XML, test x$enable_xml = xyes)
dnl Fix the Intel 810 LOD bias problem
AC_ARG_ENABLE(i810-lod-bias, [ --enable-i810-lod-bias Enable fix for Intel
810 LOD bias problem],
@@ -80,7 +81,6 @@
fi
AC_SUBST(DMALLOC_LIB)
-
dnl Use the Dom parser from libxml2, not the xmlReader one
dnl The default is to use the Dom parser
dom=yes
@@ -125,7 +125,6 @@
fi
AM_CONDITIONAL(HTTP, test x$http = xtrue)
-
dnl Where are the Docbook stylesheets ?
AC_ARG_WITH(docbook, [ --with-docbook specify the path to the Docbook
stylesheets],
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.4 gnash/plugin/plugin.cpp:1.5
--- gnash/plugin/plugin.cpp:1.4 Sun Dec 25 20:49:31 2005
+++ gnash/plugin/plugin.cpp Mon Dec 26 15:57:26 2005
@@ -481,6 +481,7 @@
int playable, all_retrieved, all_above_cache;
char *tmp;
+ streamfd = -1;
printf("%s (%i): %s\n", __PRETTY_FUNCTION__, reason, stream->url);
processing = false;
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.1 gnash/server/impl.cpp:1.2
--- gnash/server/impl.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/impl.cpp Mon Dec 26 15:57:26 2005
@@ -3735,7 +3735,7 @@
Uint16 clip_depth)
{
assert(m_def != NULL);
- printf("%s: character %s, id is %d\n", __FUNCTION__,
name, character_id); // FIXME:
+ // printf("%s: character %s, id is %d\n", __FUNCTION__,
name, character_id); // FIXME: debugging crap
character_def* cdef =
m_def->get_character_def(character_id);
if (cdef == NULL)
Index: gnash/server/xmlsocket.cpp
diff -u gnash/server/xmlsocket.cpp:1.1 gnash/server/xmlsocket.cpp:1.2
--- gnash/server/xmlsocket.cpp:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/xmlsocket.cpp Mon Dec 26 15:57:26 2005
@@ -54,12 +54,12 @@
int xml_fd = 0; // FIXME: This file descriptor is used by
// XML::checkSocket() when called from the main
// processing loop.
-bool gofast = false; // FIXME: this flag gets set based on
+extern 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
+extern 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./configure.ac backend/Makefile.am backen...,
Rob Savoye <=