[Gnash-commit] /srv/bzr/gnash/trunk r11286: Fix opengl renderer builds. Only gtk and kde4 are tested.

[John Wimer]

------------------------------------------------------------
revno: 11286
committer: John Wimer <address@hidden>
branch nick: trunk
timestamp: Mon 2009-07-20 19:31:35 +0200
message:
  Fix opengl renderer builds. Only gtk and kde4 are tested.
modified:
  backend/Renderer_ogl.cpp
  backend/Renderer_ogl.h
  gui/Kde4GlueOgl.cpp
  gui/aqua_ogl_glue.h
  gui/gtk_glue_gtkglext.cpp
  gui/kde_glue_opengl.h
  gui/sdl_ogl_glue.h

=== modified file 'backend/Renderer_ogl.cpp'
--- a/backend/Renderer_ogl.cpp  2009-07-13 07:07:59 +0000
+++ b/backend/Renderer_ogl.cpp  2009-07-20 17:31:35 +0000
@@ -23,14 +23,12 @@
 #include <cstring>
 #include <cmath>
 
-#include "Renderer.h"
 #include "swf/ShapeRecord.h"
 #include "gnash.h"
 #include "RGBA.h"
 #include "GnashImage.h"
 #include "GnashNumeric.h"
 #include "log.h"
-#include "GnashImage.h"
 #include "utility.h"
 #include "Range2d.h"
 

=== modified file 'backend/Renderer_ogl.h'
--- a/backend/Renderer_ogl.h    2009-07-10 15:44:55 +0000
+++ b/backend/Renderer_ogl.h    2009-07-20 17:31:35 +0000
@@ -48,7 +48,9 @@
 # endif
 #endif
 
-
+#include "Renderer.h"
+#include "Geometry.h"
+#include "BitmapInfo.h"
 
 
 namespace gnash {
@@ -177,7 +179,7 @@
 };
 
 
-
+DSOEXPORT Renderer* create_Renderer_ogl(bool init = true);
 
 
 

=== modified file 'gui/Kde4GlueOgl.cpp'
--- a/gui/Kde4GlueOgl.cpp       2009-07-10 15:44:55 +0000
+++ b/gui/Kde4GlueOgl.cpp       2009-07-20 17:31:35 +0000
@@ -22,6 +22,7 @@
 
 #include "Kde4GlueOgl.h"
 #include "Renderer.h"
+#include "Renderer_ogl.h"
 #include <QRect>
 #include <QGLWidget>
 

=== modified file 'gui/aqua_ogl_glue.h'
--- a/gui/aqua_ogl_glue.h       2009-07-10 15:44:55 +0000
+++ b/gui/aqua_ogl_glue.h       2009-07-20 17:31:35 +0000
@@ -20,6 +20,7 @@
 #define AQUA_OGL_GLUE_H
 
 #include "aqua_glue.h"
+#include "Renderer_ogl.h"
 #include <AGL/agl.h>
 
 

=== modified file 'gui/gtk_glue_gtkglext.cpp'
--- a/gui/gtk_glue_gtkglext.cpp 2009-07-10 15:44:55 +0000
+++ b/gui/gtk_glue_gtkglext.cpp 2009-07-20 17:31:35 +0000
@@ -19,6 +19,7 @@
 
 
 #include "gtk_glue_gtkglext.h"
+#include "Renderer_ogl.h"
 #include "log.h"
 
 using namespace std;

=== modified file 'gui/kde_glue_opengl.h'
--- a/gui/kde_glue_opengl.h     2009-07-10 15:44:55 +0000
+++ b/gui/kde_glue_opengl.h     2009-07-20 17:31:35 +0000
@@ -17,6 +17,7 @@
 
 #include <qapplication.h>
 #include "kde_glue.h"
+#include "Renderer_ogl.h"
 #include <qgl.h>
 
 

=== modified file 'gui/sdl_ogl_glue.h'
--- a/gui/sdl_ogl_glue.h        2009-07-10 15:44:55 +0000
+++ b/gui/sdl_ogl_glue.h        2009-07-20 17:31:35 +0000
@@ -16,6 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "sdl_glue.h"
+#include "Renderer_ogl.h"