[Gnash-commit] /srv/bzr/gnash/trunk r10832: Patch from Tomeu Vizoso <address@hidden>

[Markus Gothe]

------------------------------------------------------------
revno: 10832
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sat 2009-04-25 19:52:55 +0200
message:
  Patch from Tomeu Vizoso <address@hidden>
modified:
  gui/pythonmod/Makefile.am
  gui/pythonmod/gnash-view.cpp

=== modified file 'gui/pythonmod/Makefile.am'
--- a/gui/pythonmod/Makefile.am 2009-04-22 16:37:31 +0000
+++ b/gui/pythonmod/Makefile.am 2009-04-25 17:52:55 +0000
@@ -28,8 +28,8 @@
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libsound/libgnashsound.la \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/backend/libgnashcairo.la \
-       $(top_builddir)/libbase/libgnashbase.la
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(RENDERER_LIBS)
 
 gnash_la_LDFLAGS = -module -avoid-version initgnash -export-dynamic 
#-no-undefined
 gnash_la_LIBADD = \
@@ -37,12 +37,22 @@
        $(GTK2_LIBS) \
        $(DEPS_LIBS)
 
+if BUILD_OGL_RENDERER
+RENDERER_GLUE = $(top_srcdir)/gui/gtk_glue_gtkglext.cpp
+endif
+if BUILD_AGG_RENDERER
+RENDERER_GLUE = $(top_srcdir)/gui/gtk_glue_agg.cpp
+endif
+if BUILD_CAIRO_RENDERER
+RENDERER_GLUE = $(top_srcdir)/gui/gtk_glue_cairo.cpp
+endif
+
 gnash_la_SOURCES = \
        gnash.c \
        gnashmodule.c \
        gnash-view.cpp\
        $(top_srcdir)/gui/gtk_canvas.cpp \
-       $(top_srcdir)/gui/gtk_glue_cairo.cpp
+       $(RENDERER_GLUE)
 
 gnash.c: gnash.defs gnash.override
 

=== modified file 'gui/pythonmod/gnash-view.cpp'
--- a/gui/pythonmod/gnash-view.cpp      2009-04-23 18:14:24 +0000
+++ b/gui/pythonmod/gnash-view.cpp      2009-04-25 17:52:55 +0000
@@ -29,6 +29,7 @@
 #include "VM.h"
 #include "movie_definition.h"
 #include "movie_root.h" // for Abstract callbacks
+#include "render_handler.h"
 #include "sound_handler.h"
 #include "MediaHandler.h"
 #include "RunInfo.h" // for passing handlers and other data to the core.