[Gnash-commit] gnash gui/Makefile.am gui/Player.cpp ChangeLog [release-0-8-0]

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Rob Savoye <rsavoye>    07/06/05 01:50:37

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

Log message:
                * gui/Makefile.am: Build Klash as well as Gnash if KDE exists, 
and
                it hasn't been disabled.
                * plugin/klash/klash_part.cpp: Launch klash, not gnash.
                * gui/Player.cpp: If specified, force a KDE build for Klash 
regardless
                of the default gui.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.75&r2=1.75.4.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.54&r2=1.54.4.1
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451&r2=1.3451.2.1

Patches:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.75
retrieving revision 1.75.4.1
diff -u -b -r1.75 -r1.75.4.1
--- gui/Makefile.am     24 May 2007 21:35:02 -0000      1.75
+++ gui/Makefile.am     5 Jun 2007 01:50:35 -0000       1.75.4.1
@@ -15,9 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# 
-
-# $Id: Makefile.am,v 1.75 2007/05/24 21:35:02 bjacques Exp $
+# $Id: Makefile.am,v 1.75.4.1 2007/06/05 01:50:35 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -55,10 +53,6 @@
        $(ATK_LIBS) \
        $(GLIB_LIBS) \
        $(EXPAT_LIBS)
-#        $(PNG_CFLAGS) \
-#        $(JPEG_CFLAGS) \
-#        $(MP3_CFLAGS) \
-#        $(OGG_CFLAGS)
 
 ## WARNING: make sure GLIB_LIBS appears first
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
@@ -72,7 +66,6 @@
        $(PTHREAD_LIBS) \
        $(NULL)
 
-
 if USE_RENDERER_OPENGL
  AM_CPPFLAGS += $(OPENGL_CFLAGS) 
 if USE_GUI_GTK
@@ -87,7 +80,8 @@
 if USE_GUI_SDL
   SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
 endif # USE_GUI_SDL
-if USE_GUI_KDE
+#if USE_GUI_KDE
+if KLASH
   KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
   AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
   AM_LDFLAGS +=  $(KDE_LIBS) $(QT_LIBS)
@@ -133,6 +127,7 @@
   GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS) 
$(GTK_AGG_SRCS) 
   AM_LDFLAGS += $(GTK_LIBS) $(X11_LIBS)
   AM_CPPFLAGS += $(GTK_CFLAGS)
+  GUI_CPPFLAGS = -DUSE_GTK
 else
  GTK_SRCS = 
 endif
@@ -140,23 +135,27 @@
 if USE_GUI_RISCOS
  RISCOS_SRCS = riscos.cpp riscossup.h riscos_glue.h $(RISCOS_AGG_SRCS)
  AM_LDFLAGS += -lOSLib32
+  GUI_CPPFLAGS = -DUSE_RISCOS
 else
  RISCS_SRCS =
 endif
 
 if USE_GUI_AQUA
  AQUA_SRCS = aqua.cpp aquasup.h aqua_glue.h $(AQUA_OPENGL_SRCS)
+  GUI_CPPFLAGS = -DUSE_AQUA
 else
  AQUA_SRCS =
 endif
 
 if USE_GUI_SDL
  SDL_SRCS = sdl.cpp sdlsup.h sdl_glue.h $(SDL_CAIRO_SRCS) $(SDL_OPENGL_SRCS) 
$(SDL_AGG_SRCS)
+  GUI_CPPFLAGS = -DUSE_SDL
 else
  SDL_SRCS =
 endif
 
-if USE_GUI_KDE
+#if USE_GUI_KDE
+if KLASH
  KDE_SRCS = kde.cpp kdesup.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
  AM_CPPFLAGS += -I$(kde_includes)/kio $(all_includes) 
 else
@@ -201,12 +200,17 @@
 #dist_images_DATA = images/gnash_G_v3.ico
 imagesdir = $(pkgdatadir)
 
+if KLASH
+lib_LTLIBRARIES = libgnashgui.la libgnashplayer.la libklashplayer.la
+else
 lib_LTLIBRARIES = libgnashgui.la libgnashplayer.la
+endif
+
 libgnashgui_la_SOURCES = \
        $(SDL_SRCS) \
        $(FLTK_SRCS) \
        $(GTK_SRCS) \
-       $(GTK2_SRCS) \
+       $(GTK3_SRCS) \
        $(KDE_SRCS) \
        $(FB_SRCS) \
        $(AQUA_SRCS) \
@@ -215,10 +219,10 @@
        NullGui.cpp \
        NullGui.h
 
-libgnashgui_la_LIBADD = \
-       $(top_builddir)/server/libgnashserver.la \
-       $(top_builddir)/backend/libgnashbackend.la \
-       $(top_builddir)/libamf/libgnashamf.la 
+#libgnashgui_la_LIBADD = \
+#      $(top_builddir)/server/libgnashserver.la \
+#      $(top_builddir)/backend/libgnashbackend.la \
+#      $(top_builddir)/libamf/libgnashamf.la 
 
 # is LDFLAGS still needed when AM_LDFLAGS is defined already ?
 libgnashgui_la_LDFLAGS = \
@@ -227,22 +231,37 @@
        -export-dynamic \
        $(AM_LDFLAGS)
 
-if USE_GUI_KDE
-bin_PROGRAMS = gnash # klash
+if KLASH
+bin_PROGRAMS = gnash klash
 else
 bin_PROGRAMS = gnash
 endif
 
 GNASH_LIBS = \
-        libgnashgui.la \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/backend/libgnashbackend.la \
        $(top_builddir)/server/libgnashserver.la \
        $(top_builddir)/libgeometry/libgnashgeo.la \
        $(top_builddir)/libbase/libgnashbase.la \
-       libgnashplayer.la \
        libgnashgui.la
 
+if KLASH
+libklashplayer_la_SOURCES = \
+       Player.cpp Player.h
+
+libklashplayer_la_LIBADD = \
+       $(top_builddir)/server/libgnashserver.la \
+       $(top_builddir)/backend/libgnashbackend.la \
+       libgnashgui.la 
+
+libklashplayer_la_CPPFLAGS =  $(AM_CPPFLAGS) -DBUILD_KLASH
+libklashplayer_la_LDFLAGS = \
+       -release $(VERSION) \
+       -no-undefined \
+       -export-dynamic \
+       $(AM_LDFLAGS) 
+
+endif
 libgnashplayer_la_SOURCES = \
        Player.cpp Player.h
 
@@ -251,6 +270,7 @@
        $(top_builddir)/backend/libgnashbackend.la \
        libgnashgui.la 
 
+libgnashplayer_la_CPPFLAGS = $(AM_CPPFLAGS) $(GUI_CPPFLAGS)
 libgnashplayer_la_LDFLAGS = \
        -release $(VERSION) \
        -no-undefined \
@@ -260,27 +280,32 @@
 gnash_SOURCES = gnash.cpp
 # export our symbols so they can be used by Gnash plugins
 gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-gnash_DEPENDENCIES = $(GNASH_LIBS)
+gnash_DEPENDENCIES = libgnashgui.la $(GNASH_LIBS)
 gnash_LDADD = \
        $(MYSQL_LIBS) \
+        libgnashgui.la \
+        libgnashplayer.la \
        $(GNASH_LIBS)
 #      $(LIBLTDL) "-dlopen" self "-dlopen"
 
-#klash_SOURCES = gnash.cpp
-#klash_CPPFLAGS =      \
-#      $(KDE_INCLS)    \
-#      -DUSE_KDE \
-#      $(AM_CPPFLAGS)
+if KLASH
+klash_SOURCES = gnash.cpp
+klash_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(KDE_INCLS) \
+       $(AM_CPPFLAGS)
+       -DUSE_KDE
+
 # export our symbols so they can be used by Gnash plugins
-#klash_LDFLAGS = -export-dynamic
-#klash_LDADD = \
-#      $(LIB_KDECORE) \
-#      $(LIB_KDEUI) \
-#      $(GNASH_LIBS)
+klash_LDFLAGS =  $(LIBLTDL) -export-dynamic
+klash_LDADD = \
+       $(LIB_KDECORE) \
+       $(LIB_KDEUI) \
+        libklashplayer.la \
+       $(GNASH_LIBS)
 
-#klash_DEPENDENCIES = \
-#      $(GNASH_LIBS) 
-#       $(LIBLTDL) "-dlopen" self "-dlopen"
+klash_DEPENDENCIES = libklashgui.la $(GNASH_LIBS) 
+endif
 
 CLEANFILES = klash.moc
 klash.moc: $(srcdir)/kdesup.h

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.54
retrieving revision 1.54.4.1
diff -u -b -r1.54 -r1.54.4.1
--- gui/Player.cpp      1 Jun 2007 15:01:55 -0000       1.54
+++ gui/Player.cpp      5 Jun 2007 01:50:36 -0000       1.54.4.1
@@ -21,6 +21,12 @@
 #include "config.h"
 #endif
 
+#ifdef BUILD_KLASH
+#undef GUI_GTK
+#undef GUI_KDE
+#define GUI_KDE 1
+#endif
+
 #ifndef GUI_KDE
 # ifdef GUI_GTK
 #  include "gtksup.h"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451
retrieving revision 1.3451.2.1
diff -u -b -r1.3451 -r1.3451.2.1
--- ChangeLog   4 Jun 2007 18:16:57 -0000       1.3451
+++ ChangeLog   5 Jun 2007 01:50:36 -0000       1.3451.2.1
@@ -1,3 +1,11 @@
+2007-06-04  Rob Savoye  <address@hidden>
+
+       * gui/Makefile.am: Build Klash as well as Gnash if KDE exists, and
+       it hasn't been disabled.
+       * plugin/klash/klash_part.cpp: Launch klash, not gnash.
+       * gui/Player.cpp: If specified, force a KDE build for Klash regardless
+       of the default gui.
+
 2007-06-04 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/NetStream-SquareTest.c: set SWF rate back to