[Gnash-commit] gnash ChangeLog gui/Makefile.am gui/sdl_ogl_glu...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/17 13:50:39

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am sdl_ogl_glue.cpp 

Log message:
                * gui/Makefile.am: when we are building the KDE GUI, build
                target klash.moc before anything else.
                * gui/sdl_ogl_glue.cpp: variable depth is now called _bpp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1263&r2=1.1264
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_ogl_glue.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1263
retrieving revision 1.1264
diff -u -b -r1.1263 -r1.1264
--- ChangeLog   17 Oct 2006 13:12:43 -0000      1.1263
+++ ChangeLog   17 Oct 2006 13:50:39 -0000      1.1264
@@ -1,3 +1,9 @@
+2006-10-17 Bastiaan Jacques <address@hidden>
+
+       * gui/Makefile.am: when we are building the KDE GUI, build
+       target klash.moc before anything else.
+       * gui/sdl_ogl_glue.cpp: variable depth is now called _bpp.
+
 2006-10-17 Sandro Santilli <address@hidden>
 
        * gui/gui.{cpp,h}: notify_mouse_moved made non-static; call

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gui/Makefile.am     16 Oct 2006 15:27:53 -0000      1.36
+++ gui/Makefile.am     17 Oct 2006 13:50:39 -0000      1.37
@@ -35,7 +35,7 @@
 # forward this exception.
 # 
 
-# $Id: Makefile.am,v 1.36 2006/10/16 15:27:53 bjacques Exp $
+# $Id: Makefile.am,v 1.37 2006/10/17 13:50:39 bjacques Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -83,6 +83,7 @@
         $(KDE_LDFLAGS) \
        $(LIB_KDECORE) \
        $(LIB_KDEUI)
+  BUILT_SOURCES = klash.moc
 endif # USE_GUI_KDE
 else # ! USE_RENDERER_OPENGL
  GTK_OPENGL_SRCS =
@@ -222,7 +223,7 @@
        $(GNASH_LIBS) \
        libgnashplayer.la
 
-klash_DEPENDENCIES = klash.moc libgnashgui.la
+klash_DEPENDENCIES = libgnashgui.la
 
 CLEANFILES = klash.moc
 klash.moc: $(srcdir)/kdesup.h

Index: gui/sdl_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_ogl_glue.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gui/sdl_ogl_glue.cpp        16 Oct 2006 15:27:53 -0000      1.4
+++ gui/sdl_ogl_glue.cpp        17 Oct 2006 13:50:39 -0000      1.5
@@ -110,7 +110,7 @@
       SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
       SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
     } else {
-      assert(depth == 32);
+      assert(_bpp == 32);
 
       // 32-bit color etc, for getting dest alpha,
       // for MULTIPASS_ANTIALIASING (see