[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12305: reorganize gui files into su
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12305: reorganize gui files into sub-directories, no other changes. |
|
Date: |
Wed, 14 Jul 2010 22:17:35 -0600 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12305 [merge]
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-14 22:17:35 -0600
message:
reorganize gui files into sub-directories, no other changes.
added:
gui/aos4/
gui/fb/
gui/fltk/
gui/gtk/
gui/haiku/
gui/kde/
gui/sdl/
renamed:
gui/GuiKde4.cpp => gui/kde/GuiKde4.cpp
gui/Kde4Glue.cpp => gui/kde/Kde4Glue.cpp
gui/Kde4Glue.h => gui/kde/Kde4Glue.h
gui/Kde4Glue.moc.in => gui/kde/Kde4Glue.moc.in
gui/Kde4GlueAgg.cpp => gui/kde/Kde4GlueAgg.cpp
gui/Kde4GlueAgg.h => gui/kde/Kde4GlueAgg.h
gui/Kde4GlueCairo.cpp => gui/kde/Kde4GlueCairo.cpp
gui/Kde4GlueCairo.h => gui/kde/Kde4GlueCairo.h
gui/Kde4GlueOgl.cpp => gui/kde/Kde4GlueOgl.cpp
gui/Kde4GlueOgl.h => gui/kde/Kde4GlueOgl.h
gui/Kde4Gui.cpp => gui/kde/Kde4Gui.cpp
gui/Kde4Gui.h => gui/kde/Kde4Gui.h
gui/Kde4Gui.moc.in => gui/kde/Kde4Gui.moc.in
gui/am-frag/aos4.am => gui/aos4/aos4.am
gui/am-frag/fb.am => gui/fb/fb.am
gui/am-frag/fltk.am => gui/fltk/fltk.am
gui/am-frag/gtk.am => gui/gtk/gtk.am
gui/am-frag/haiku.am => gui/haiku/haiku.am
gui/am-frag/kde3.am => gui/kde/kde3.am
gui/am-frag/kde4.am => gui/kde/kde4.am
gui/am-frag/qtopia3.am => gui/kde/qtopia3.am
gui/am-frag/sdl.am => gui/sdl/sdl.am
gui/aos4.cpp => gui/aos4/aos4.cpp
gui/aos4_agg_glue.cpp => gui/aos4/aos4_agg_glue.cpp
gui/aos4_agg_glue.h => gui/aos4/aos4_agg_glue.h
gui/aos4_cairo_glue.cpp => gui/aos4/aos4_cairo_glue.cpp
gui/aos4_cairo_glue.h => gui/aos4/aos4_cairo_glue.h
gui/aos4_glue.h => gui/aos4/aos4_glue.h
gui/aos4_gnash_prefs.cpp => gui/aos4/aos4_gnash_prefs.cpp
gui/aos4_gnash_prefs.h => gui/aos4/aos4_gnash_prefs.h
gui/aos4sup.h => gui/aos4/aos4sup.h
gui/fb.cpp => gui/fb/fb.cpp
gui/fbsup.h => gui/fb/fbsup.h
gui/fltk.cpp => gui/fltk/fltk.cpp
gui/fltk_glue_agg.cpp => gui/fltk/fltk_glue_agg.cpp
gui/fltk_glue_agg.h => gui/fltk/fltk_glue_agg.h
gui/fltk_glue_cairo.cpp => gui/fltk/fltk_glue_cairo.cpp
gui/fltk_glue_cairo.h => gui/fltk/fltk_glue_cairo.h
gui/fltksup.h => gui/fltk/fltksup.h
gui/gtk.cpp => gui/gtk/gtk.cpp
gui/gtk_cairo_create.h => gui/gtk/gtk_cairo_create.h
gui/gtk_canvas.cpp => gui/gtk/gtk_canvas.cpp
gui/gtk_canvas.h => gui/gtk/gtk_canvas.h
gui/gtk_glue.h => gui/gtk/gtk_glue.h
gui/gtk_glue_agg.cpp => gui/gtk/gtk_glue_agg.cpp
gui/gtk_glue_agg.h => gui/gtk/gtk_glue_agg.h
gui/gtk_glue_agg_vaapi.cpp => gui/gtk/gtk_glue_agg_vaapi.cpp
gui/gtk_glue_agg_vaapi.h => gui/gtk/gtk_glue_agg_vaapi.h
gui/gtk_glue_agg_xv.cpp => gui/gtk/gtk_glue_agg_xv.cpp
gui/gtk_glue_agg_xv.h => gui/gtk/gtk_glue_agg_xv.h
gui/gtk_glue_cairo.cpp => gui/gtk/gtk_glue_cairo.cpp
gui/gtk_glue_cairo.h => gui/gtk/gtk_glue_cairo.h
gui/gtk_glue_gtkglext.cpp => gui/gtk/gtk_glue_gtkglext.cpp
gui/gtk_glue_gtkglext.h => gui/gtk/gtk_glue_gtkglext.h
gui/gtksup.h => gui/gtk/gtksup.h
gui/gui_aos4.cpp => gui/aos4/gui_aos4.cpp
gui/gui_fb.cpp => gui/fb/gui_fb.cpp
gui/gui_fltk.cpp => gui/fltk/gui_fltk.cpp
gui/gui_gtk.cpp => gui/gtk/gui_gtk.cpp
gui/gui_haiku.cpp => gui/haiku/gui_haiku.cpp
gui/gui_kde.cpp => gui/kde/gui_kde.cpp
gui/gui_sdl.cpp => gui/sdl/gui_sdl.cpp
gui/haiku.cpp => gui/haiku/haiku.cpp
gui/haiku_agg_glue.cpp => gui/haiku/haiku_agg_glue.cpp
gui/haiku_agg_glue.h => gui/haiku/haiku_agg_glue.h
gui/haikusup.h => gui/haiku/haikusup.h
gui/kde.cpp => gui/kde/kde.cpp
gui/kde_glue.h => gui/kde/kde_glue.h
gui/kde_glue_agg.cpp => gui/kde/kde_glue_agg.cpp
gui/kde_glue_agg.h => gui/kde/kde_glue_agg.h
gui/kde_glue_opengl.cpp => gui/kde/kde_glue_opengl.cpp
gui/kde_glue_opengl.h => gui/kde/kde_glue_opengl.h
gui/kdesup.h => gui/kde/kdesup.h
gui/klash3.moc.in => gui/kde/klash3.moc.in
gui/sdl.cpp => gui/sdl/sdl.cpp
gui/sdl_agg_glue.cpp => gui/sdl/sdl_agg_glue.cpp
gui/sdl_agg_glue.h => gui/sdl/sdl_agg_glue.h
gui/sdl_cairo_glue.cpp => gui/sdl/sdl_cairo_glue.cpp
gui/sdl_cairo_glue.h => gui/sdl/sdl_cairo_glue.h
gui/sdl_glue.h => gui/sdl/sdl_glue.h
gui/sdl_ogl_glue.cpp => gui/sdl/sdl_ogl_glue.cpp
gui/sdl_ogl_glue.h => gui/sdl/sdl_ogl_glue.h
gui/sdlsup.h => gui/sdl/sdlsup.h
modified:
cygnal/Makefile.am
gui/Makefile.am
gui/am-frag/alp.am
gui/am-frag/hildon.am
gui/pythonmod/Makefile.am
gui/aos4/aos4.am
gui/fb/fb.am
gui/fltk/fltk.am
gui/gtk/gtk.am
gui/haiku/haiku.am
gui/kde/kde3.am
gui/kde/kde4.am
gui/kde/qtopia3.am
gui/sdl/sdl.am
gui/fltk/fltk_glue_agg.cpp
=== modified file 'cygnal/Makefile.am'
--- a/cygnal/Makefile.am 2010-03-14 02:26:46 +0000
+++ b/cygnal/Makefile.am 2010-07-15 03:07:54 +0000
@@ -104,7 +104,6 @@
libcygnal_la_SOURCES = \
crc.cpp \
- cvm.cpp \
rtmp_server.cpp \
http_server.cpp \
proc.cpp \
=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am 2010-07-10 04:01:46 +0000
+++ b/gui/Makefile.am 2010-07-15 03:07:54 +0000
@@ -33,7 +33,11 @@
# noinst_LTLIBRARIES = libgnashgui.la
BUILT_SOURCES = .configline
-EXTRA_DIST = gnash.in klash3.moc.in Kde4Gui.moc.in Kde4Glue.moc.in am-frag
+EXTRA_DIST = gnash.in \
+ kde/klash3.moc.in \
+ kde/Kde4Gui.moc.in \
+ kde/Kde4Glue.moc.in \
+ am-frag
# If python support is enabled, built that too
if HAS_PYTHON
@@ -205,40 +209,40 @@
# Build the QTOPIA gui
if BUILD_QTOPIA3_GUI
-include $(srcdir)/am-frag/qtopia3.am
+include $(srcdir)/kde/qtopia3.am
endif
# Build the KDE3 gui
if BUILD_KDE3_GUI
BUILT_SOURCES += klash3.moc
-include $(srcdir)/am-frag/kde3.am
+include $(srcdir)/kde/kde3.am
endif
# Build the KDE4 gui
if BUILD_KDE4_GUI
BUILT_SOURCES += Kde4Gui.moc
BUILT_SOURCES += Kde4Glue.moc
-include $(srcdir)/am-frag/kde4.am
+include $(srcdir)/kde/kde4.am
endif
# Build the SDL gui
if BUILD_SDL_GUI
-include $(srcdir)/am-frag/sdl.am
+include $(srcdir)/sdl/sdl.am
endif
# Build the AmigaOS4 gui
if BUILD_AMIGAOS4_GUI
-include $(srcdir)/am-frag/aos4.am
+include $(srcdir)/aos4/aos4.am
endif
# Build the Haiku gui
if BUILD_HAIKU_GUI
-include $(srcdir)/am-frag/haiku.am
+include $(srcdir)/haiku/haiku.am
endif
# Build the FLTK gui
if BUILD_FLTK_GUI
-include $(srcdir)/am-frag/fltk.am
+include $(srcdir)/fltk/fltk.am
endif
# Build the AQUA gui
@@ -248,7 +252,7 @@
# Build the GTK gui
if BUILD_GTK_GUI
-include $(srcdir)/am-frag/gtk.am
+include $(srcdir)/gtk/gtk.am
endif
# if ALP # Access Linux Platform
@@ -273,7 +277,7 @@
# Build the FB gui
if BUILD_FB_GUI
-include $(srcdir)/am-frag/fb.am
+include $(srcdir)/fb/fb.am
endif
# Build the RISCOS gui
=== modified file 'gui/am-frag/alp.am'
--- a/gui/am-frag/alp.am 2010-01-01 17:48:26 +0000
+++ b/gui/am-frag/alp.am 2010-07-15 03:07:54 +0000
@@ -25,7 +25,7 @@
if BUILD_ALP_GUI
pkglib_LTLIBRARIES = libgnashalp.la
-libgnashalp_la_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+libgnashalp_la_SOURCES = $(GUI_SRCS) gtk/gui_gtk.cpp
libgnashalp_la_CPPFLAGS = $(gtk_gnash_CPPFLAGS)\
$(ALP_CFLAGS) -DGUI_ALP -DGUI_CONFIG=\"ALP\" \
-DALP_BUILD=ALP_BUILD_DEBUG
@@ -33,20 +33,20 @@
libgnashalp_la_LIBADD = $(gtk_gnash_LDADD) $(ALP_LIBS)
if BUILD_OGL_RENDERER
libgnashalp_la_CPPFLAGS += $(OPENGL_CFLAGS)
-libgnashalp_la_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
- gtk.cpp gtksup.h gtk_glue.h
+libgnashalp_la_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
libgnashalp_la_LIBADD += $(OPENGL_LIBS)
endif # BUILD_OGL_RENDERER
if BUILD_AGG_RENDERER
libgnashalp_la_CPPFLAGS += $(AGG_CFLAGS)
-libgnashalp_la_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
- gtk.cpp gtksup.h gtk_glue.h
+libgnashalp_la_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
libgnashalp_la_LIBADD += $(AGG_LIBS)
endif # BUILD_AGG_RENDERER
if BUILD_CAIRO_RENDERER
libgnashalp_la_CPPFLAGS += $(CAIRO_CFLAGS)
-libgnashalp_la_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
- gtk.cpp gtksup.h gtk_glue.h
+libgnashalp_la_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
libgnashalp_la_LIBADD += $(CAIRO_LIBS)
endif # BUILD_CAIRO_RENDERER
=== modified file 'gui/am-frag/hildon.am'
--- a/gui/am-frag/hildon.am 2010-03-11 03:27:57 +0000
+++ b/gui/am-frag/hildon.am 2010-07-15 03:07:54 +0000
@@ -20,7 +20,7 @@
#
if BUILD_HILDON_GUI
bin_PROGRAMS += hildon-gnash
-hildon_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+hildon_gnash_SOURCES = $(GUI_SRCS) gtk/gui_gtk.cpp
hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
$(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
@@ -28,23 +28,23 @@
if BUILD_OGL_RENDERER
hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-hildon_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
- gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
hildon_gnash_LDADD = $(top_builddir)/librender/libgnashogl.la \
$(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
endif # BUILD_OGL_RENDERER
if BUILD_AGG_RENDERER
hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
-hildon_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
- gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
hildon_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
$(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
endif # BUILD_AGG_RENDERER
if BUILD_CAIRO_RENDERER
hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-hildon_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
- gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
hildon_gnash_LDADD = $(top_builddir)/librender/libgnashcairo.la \
$(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
endif # BUILD_CAIRO_RENDERER
@@ -55,7 +55,7 @@
# #
# if BUILD_HILDON_GUI
# bin_PROGRAMS += hildon-gnash
-# hildon_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+# hildon_gnash_SOURCES = $(GUI_SRCS) gtk/gui_gtk.cpp
# hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
# $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
# hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
@@ -63,23 +63,23 @@
# if BUILD_OGL_RENDERER
# hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-# hildon_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
-# gtk.cpp gtksup.h gtk_glue.h
+# hildon_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h \
+# gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
# hildon_gnash_LDADD = $(top_builddir)/librender/libgnashogl.la \
# $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
# endif # BUILD_OGL_RENDERER
# if BUILD_AGG_RENDERER
# hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
-# hildon_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
-# gtk.cpp gtksup.h gtk_glue.h
+# hildon_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h \
+# gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
# hildon_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
# $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
# endif # BUILD_AGG_RENDERER
# if BUILD_CAIRO_RENDERER
# hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-# hildon_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
-# gtk.cpp gtksup.h gtk_glue.h
+# hildon_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h \
+# gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
# hildon_gnash_LDADD = $(top_builddir)/librender/libgnashcairo.la \
# $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
# endif # BUILD_CAIRO_RENDERER
=== added directory 'gui/aos4'
=== renamed file 'gui/am-frag/aos4.am' => 'gui/aos4/aos4.am'
--- a/gui/am-frag/aos4.am 2010-07-12 22:04:07 +0000
+++ b/gui/aos4/aos4.am 2010-07-15 03:07:54 +0000
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-EXTRA_DIST += aos4_ogl_glue.cpp aos4_ogl_glue.h
+EXTRA_DIST += aos4/aos4_ogl_glue.cpp aos4/aos4_ogl_glue.h
#
# Build the AOS4 gui
@@ -24,7 +24,13 @@
bin_PROGRAMS += aos4-gnash
aos4_gnash_CPPFLAGS = -DGUI_AOS4 -DGUI_CONFIG=\"AOS4\" \
$(AM_CPPFLAGS) $(AOS4_CFLAGS)
-aos4_gnash_SOURCES = $(GUI_SRCS) aos4_gnash_prefs.cpp aos4_gnash_prefs.h
gui_aos4.cpp aos4.cpp aos4sup.h aos4_glue.h
+aos4_gnash_SOURCES = $(GUI_SRCS) \
+ aos4/aos4_gnash_prefs.cpp \
+ aos4/aos4_gnash_prefs.h \
+ aos4/gui_aos4.cpp \
+ aos4/aos4.cpp \
+ aos4/aos4sup.h \
+ aos4/aos4_glue.h
aos4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#aos4_gnash_DEPENDENCIES = .configline
aos4_gnash_LDADD = \
@@ -37,18 +43,18 @@
# if BUILD_OGL_RENDERER
# aos4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
# $(OPENGL_LIBS)
-# aos4_gnash_SOURCES += aos4_ogl_glue.cpp aos4_ogl_glue.h
+# aos4_gnash_SOURCES += aos4/aos4_ogl_glue.cpp aos4/aos4_ogl_glue.h
# endif
if BUILD_AGG_RENDERER
aos4_gnash_CPPFLAGS += $(AGG_CFLAGS)
aos4_gnash_LDADD += $(AGG_LIBS)
-aos4_gnash_SOURCES += aos4_agg_glue.cpp aos4_agg_glue.h
+aos4_gnash_SOURCES += aos4/aos4_agg_glue.cpp aos4/aos4_agg_glue.h
endif
if BUILD_CAIRO_RENDERER
aos4_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
aos4_gnash_LDADD += $(CAIRO_LIBS)
-aos4_gnash_SOURCES += aos4_cairo_glue.cpp aos4_cairo_glue.h
+aos4_gnash_SOURCES += aos4/aos4_cairo_glue.cpp aos4/aos4_cairo_glue.h
endif
endif
=== renamed file 'gui/aos4.cpp' => 'gui/aos4/aos4.cpp'
=== renamed file 'gui/aos4_agg_glue.cpp' => 'gui/aos4/aos4_agg_glue.cpp'
=== renamed file 'gui/aos4_agg_glue.h' => 'gui/aos4/aos4_agg_glue.h'
=== renamed file 'gui/aos4_cairo_glue.cpp' => 'gui/aos4/aos4_cairo_glue.cpp'
=== renamed file 'gui/aos4_cairo_glue.h' => 'gui/aos4/aos4_cairo_glue.h'
=== renamed file 'gui/aos4_glue.h' => 'gui/aos4/aos4_glue.h'
=== renamed file 'gui/aos4_gnash_prefs.cpp' => 'gui/aos4/aos4_gnash_prefs.cpp'
=== renamed file 'gui/aos4_gnash_prefs.h' => 'gui/aos4/aos4_gnash_prefs.h'
=== renamed file 'gui/aos4sup.h' => 'gui/aos4/aos4sup.h'
=== renamed file 'gui/gui_aos4.cpp' => 'gui/aos4/gui_aos4.cpp'
=== added directory 'gui/fb'
=== renamed file 'gui/am-frag/fb.am' => 'gui/fb/fb.am'
--- a/gui/am-frag/fb.am 2010-03-15 21:42:16 +0000
+++ b/gui/fb/fb.am 2010-07-15 03:07:54 +0000
@@ -20,7 +20,7 @@
#
if BUILD_FB_GUI
bin_PROGRAMS += fb-gnash
-fb_gnash_SOURCES = $(GUI_SRCS) gui_fb.cpp fb.cpp fbsup.h
+fb_gnash_SOURCES = $(GUI_SRCS) fb/gui_fb.cpp fb/fb.cpp fb/fbsup.h
fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
$(AM_CPPFLAGS)
fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
=== renamed file 'gui/fb.cpp' => 'gui/fb/fb.cpp'
=== renamed file 'gui/fbsup.h' => 'gui/fb/fbsup.h'
=== renamed file 'gui/gui_fb.cpp' => 'gui/fb/gui_fb.cpp'
=== added directory 'gui/fltk'
=== renamed file 'gui/am-frag/fltk.am' => 'gui/fltk/fltk.am'
--- a/gui/am-frag/fltk.am 2010-03-11 03:27:57 +0000
+++ b/gui/fltk/fltk.am 2010-07-15 03:07:54 +0000
@@ -22,7 +22,7 @@
bin_PROGRAMS += fltk-gnash
fltk_gnash_CPPFLAGS = -DGUI_FLTK -DGUI_CONFIG=\"FLTK\" \
$(AM_CPPFLAGS) $(FLTK2_CFLAGS)
-fltk_gnash_SOURCES = $(GUI_SRCS) gui_fltk.cpp
+fltk_gnash_SOURCES = $(GUI_SRCS) fltk/gui_fltk.cpp
fltk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
if WIN32
fltk_gnash_LDFLAGS += -no-undefined
@@ -31,24 +31,25 @@
fltk_gnash_LDADD = \
$(MYSQL_LIBS) \
$(GNASH_LIBS) \
+ $(X!!_LIBS) \
$(AM_LDFLAGS)
# if BUILD_OGL_RENDERER
# fltk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-# fltk_gnash_LDADD += $(top_builddir)/librender/libgnashogl.la
+# fltk_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la
# $(SDL_LIBS) $(OPENGL_LIBS)
-# fltk_gnash_SOURCES += fltk_glue_ogl.cpp fltk_glue_ogl.h \
-# fltk.cpp fltksup.h
+# fltk_gnash_SOURCES += fltk/fltk_glue_ogl.cpp fltk/fltk_glue_ogl.h \
+# fltk/fltk.cpp fltk/fltksup.h
# endif
if BUILD_AGG_RENDERER
fltk_gnash_CPPFLAGS += $(AGG_CFLAGS)
fltk_gnash_LDADD += \
- $(top_builddir)/librender/libgnashagg.la \
+ $(top_builddir)/librender/libgnashrender.la \
$(FLTK2_LIBS) $(AGG_LIBS) $(XFT_LIBS) $(X11_LIBS)
if WIN32
fltk_gnash_LDADD += $(top_builddir)/libcore/libgnashcore.la
endif
-fltk_gnash_SOURCES += fltk_glue_agg.cpp fltk_glue_agg.h \
- fltk.cpp fltksup.h
+fltk_gnash_SOURCES += fltk/fltk_glue_agg.cpp fltk/fltk_glue_agg.h \
+ fltk/fltk.cpp fltk/fltksup.h
endif
if WIN32
fltk_gnash_LDADD += -lgdi32 -lole32 -luuid -lws2_32 -lmsimg32
=== renamed file 'gui/fltk.cpp' => 'gui/fltk/fltk.cpp'
=== renamed file 'gui/fltk_glue_agg.cpp' => 'gui/fltk/fltk_glue_agg.cpp'
--- a/gui/fltk_glue_agg.cpp 2010-02-23 17:06:43 +0000
+++ b/gui/fltk/fltk_glue_agg.cpp 2010-07-15 03:07:54 +0000
@@ -29,6 +29,7 @@
#include "Renderer.h"
#include "Renderer_agg.h"
+#include "GnashException.h"
using namespace std;
=== renamed file 'gui/fltk_glue_agg.h' => 'gui/fltk/fltk_glue_agg.h'
=== renamed file 'gui/fltk_glue_cairo.cpp' => 'gui/fltk/fltk_glue_cairo.cpp'
=== renamed file 'gui/fltk_glue_cairo.h' => 'gui/fltk/fltk_glue_cairo.h'
=== renamed file 'gui/fltksup.h' => 'gui/fltk/fltksup.h'
=== renamed file 'gui/gui_fltk.cpp' => 'gui/fltk/gui_fltk.cpp'
=== added directory 'gui/gtk'
=== renamed file 'gui/am-frag/gtk.am' => 'gui/gtk/gtk.am'
--- a/gui/am-frag/gtk.am 2010-05-28 15:51:26 +0000
+++ b/gui/gtk/gtk.am 2010-07-15 03:07:54 +0000
@@ -19,7 +19,7 @@
# Build the GTK gui
#
-GTK_CANVAS = gtk_canvas.cpp gtk_canvas.h
+GTK_CANVAS = gtk/gtk_canvas.cpp gtk/gtk_canvas.h
if BUILD_GTK_GUI
bin_PROGRAMS += gtk-gnash
@@ -28,7 +28,8 @@
GTK_CFLAGS += -DALP_BUILD=ALP_BUILD_DEBUG
endif
-gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) gtk.cpp gtksup.h gtk_glue.h
gui_gtk.cpp
+gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) \
+ gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h gtk/gui_gtk.cpp
gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
$(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
@@ -36,24 +37,24 @@
if BUILD_OGL_RENDERER
gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
+gtk_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
endif # BUILD_OGL_RENDERER
if BUILD_AGG_RENDERER
gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h
+gtk_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
if HAVE_XV
-gtk_gnash_SOURCES += gtk_glue_agg_xv.cpp gtk_glue_agg_xv.h
+gtk_gnash_SOURCES += gtk/gtk_glue_agg_xv.cpp gtk/gtk_glue_agg_xv.h
gtk_gnash_LDADD += $(X11_LIBS)
endif # HAVE_XV
if HAVE_VAAPI
-noinst_HEADERS += gtk_glue_agg_vaapi.h
-gtk_gnash_SOURCES += gtk_glue_agg_vaapi.cpp
+noinst_HEADERS += gtk/gtk_glue_agg_vaapi.h
+gtk_gnash_SOURCES += gtk/gtk_glue_agg_vaapi.cpp
gtk_gnash_CPPFLAGS += \
$(X11_CFLAGS) \
$(LIBVA_X11_CFLAGS) \
@@ -69,8 +70,10 @@
if BUILD_CAIRO_RENDERER
gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h
+gtk_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
endif # BUILD_CAIRO_RENDERER
+
endif # BUILD_GTK_GUI
+
=== renamed file 'gui/gtk.cpp' => 'gui/gtk/gtk.cpp'
=== renamed file 'gui/gtk_cairo_create.h' => 'gui/gtk/gtk_cairo_create.h'
=== renamed file 'gui/gtk_canvas.cpp' => 'gui/gtk/gtk_canvas.cpp'
=== renamed file 'gui/gtk_canvas.h' => 'gui/gtk/gtk_canvas.h'
=== renamed file 'gui/gtk_glue.h' => 'gui/gtk/gtk_glue.h'
=== renamed file 'gui/gtk_glue_agg.cpp' => 'gui/gtk/gtk_glue_agg.cpp'
=== renamed file 'gui/gtk_glue_agg.h' => 'gui/gtk/gtk_glue_agg.h'
=== renamed file 'gui/gtk_glue_agg_vaapi.cpp' =>
'gui/gtk/gtk_glue_agg_vaapi.cpp'
=== renamed file 'gui/gtk_glue_agg_vaapi.h' => 'gui/gtk/gtk_glue_agg_vaapi.h'
=== renamed file 'gui/gtk_glue_agg_xv.cpp' => 'gui/gtk/gtk_glue_agg_xv.cpp'
=== renamed file 'gui/gtk_glue_agg_xv.h' => 'gui/gtk/gtk_glue_agg_xv.h'
=== renamed file 'gui/gtk_glue_cairo.cpp' => 'gui/gtk/gtk_glue_cairo.cpp'
=== renamed file 'gui/gtk_glue_cairo.h' => 'gui/gtk/gtk_glue_cairo.h'
=== renamed file 'gui/gtk_glue_gtkglext.cpp' => 'gui/gtk/gtk_glue_gtkglext.cpp'
=== renamed file 'gui/gtk_glue_gtkglext.h' => 'gui/gtk/gtk_glue_gtkglext.h'
=== renamed file 'gui/gtksup.h' => 'gui/gtk/gtksup.h'
=== renamed file 'gui/gui_gtk.cpp' => 'gui/gtk/gui_gtk.cpp'
=== added directory 'gui/haiku'
=== renamed file 'gui/gui_haiku.cpp' => 'gui/haiku/gui_haiku.cpp'
=== renamed file 'gui/am-frag/haiku.am' => 'gui/haiku/haiku.am'
--- a/gui/am-frag/haiku.am 2010-07-06 11:00:34 +0000
+++ b/gui/haiku/haiku.am 2010-07-15 03:07:54 +0000
@@ -21,7 +21,10 @@
if BUILD_HAIKU_GUI
bin_PROGRAMS += haiku-gnash
-haiku_gnash_SOURCES = $(GUI_SRCS) gui_haiku.cpp haiku.cpp haikusup.h
+haiku_gnash_SOURCES = $(GUI_SRCS) \
+ haiku/gui_haiku.cpp \
+ haiku/haiku.cpp \
+ haiku/haikusup.h
haiku_gnash_CPPFLAGS = -DGUI_HAIKU -DGUI_CONFIG=\"HAIKU\" \
$(AM_CPPFLAGS) $(HAIKU_CFLAGS)
haiku_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
@@ -34,7 +37,7 @@
# -lbe must be after -lagg
haiku_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(AGG_LIBS) $(HAIKU_LIBS)
-haiku_gnash_SOURCES += haiku_agg_glue.cpp haiku_agg_glue.h
+haiku_gnash_SOURCES += haiku/haiku_agg_glue.cpp haiku/haiku_agg_glue.h
endif # BUILD_AGG_RENDERER
endif # BUILD_HAIKU_GUI
=== renamed file 'gui/haiku.cpp' => 'gui/haiku/haiku.cpp'
=== renamed file 'gui/haiku_agg_glue.cpp' => 'gui/haiku/haiku_agg_glue.cpp'
=== renamed file 'gui/haiku_agg_glue.h' => 'gui/haiku/haiku_agg_glue.h'
=== renamed file 'gui/haikusup.h' => 'gui/haiku/haikusup.h'
=== added directory 'gui/kde'
=== renamed file 'gui/GuiKde4.cpp' => 'gui/kde/GuiKde4.cpp'
=== renamed file 'gui/Kde4Glue.cpp' => 'gui/kde/Kde4Glue.cpp'
=== renamed file 'gui/Kde4Glue.h' => 'gui/kde/Kde4Glue.h'
=== renamed file 'gui/Kde4Glue.moc.in' => 'gui/kde/Kde4Glue.moc.in'
=== renamed file 'gui/Kde4GlueAgg.cpp' => 'gui/kde/Kde4GlueAgg.cpp'
=== renamed file 'gui/Kde4GlueAgg.h' => 'gui/kde/Kde4GlueAgg.h'
=== renamed file 'gui/Kde4GlueCairo.cpp' => 'gui/kde/Kde4GlueCairo.cpp'
=== renamed file 'gui/Kde4GlueCairo.h' => 'gui/kde/Kde4GlueCairo.h'
=== renamed file 'gui/Kde4GlueOgl.cpp' => 'gui/kde/Kde4GlueOgl.cpp'
=== renamed file 'gui/Kde4GlueOgl.h' => 'gui/kde/Kde4GlueOgl.h'
=== renamed file 'gui/Kde4Gui.cpp' => 'gui/kde/Kde4Gui.cpp'
=== renamed file 'gui/Kde4Gui.h' => 'gui/kde/Kde4Gui.h'
=== renamed file 'gui/Kde4Gui.moc.in' => 'gui/kde/Kde4Gui.moc.in'
=== renamed file 'gui/gui_kde.cpp' => 'gui/kde/gui_kde.cpp'
=== renamed file 'gui/kde.cpp' => 'gui/kde/kde.cpp'
=== renamed file 'gui/am-frag/kde3.am' => 'gui/kde/kde3.am'
--- a/gui/am-frag/kde3.am 2010-03-11 03:27:57 +0000
+++ b/gui/kde/kde3.am 2010-07-15 03:07:54 +0000
@@ -20,20 +20,20 @@
#
if BUILD_KDE3_GUI
-klash3.moc: $(srcdir)/kdesup.h
+klash3.moc: $(srcdir)/kde/kdesup.h
@if test x"$(MOC3)" != x; then \
echo "Generating MOC 3 file..."; \
- $(MOC3) $(srcdir)/kdesup.h -o klash3.moc; \
+ $(MOC3) $(srcdir)/kde/kdesup.h -o klash3.moc; \
else \
echo "WARNING: Install QT 3.x moc tool! Linking to default MOC file";
\
- ln -sf $(srcdir)/klash3.moc.in klash3.moc; \
+ ln -sf $(srcdir)/kde/klash3.moc.in klash3.moc; \
fi
bin_PROGRAMS += kde3-gnash
kde3_gnash_CPPFLAGS = -DGUI_KDE3 -DGUI_CONFIG=\"KDE3\" \
$(AM_CPPFLAGS) $(KDE3_CFLAGS) $(QT3_CFLAGS)
-kde3_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
+kde3_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp
kde3_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#kde_gnash_DEPENDENCIES = .configline
kde3_gnash_LDADD = \
@@ -42,16 +42,23 @@
$(AM_LDFLAGS)
if BUILD_OGL_RENDERER
kde3_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-kde3_gnash_LDADD += $(top_builddir)/librender/libgnashogl.la \
+kde3_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(KDE3_LIBS) $(QT3_LIBS) $(OPENGL_LIBS)
-kde3_gnash_SOURCES += kde_glue_opengl.cpp kde_glue_opengl.h kde_glue.h \
- kde.cpp kdesup.h kde_glue.h
+kde3_gnash_SOURCES += kde/kde_glue_opengl.cpp \
+ kde/kde_glue_opengl.h \
+ kde/kde_glue.h \
+ kde/kde.cpp \
+ kde/kdesup.h \
+ kde/kde_glue.h
endif
if BUILD_AGG_RENDERER
kde3_gnash_CPPFLAGS += $(AGG_CFLAGS) $(QT3_CFLAGS)
-kde3_gnash_LDADD += $(top_builddir)/librender/libgnashagg.la \
+kde3_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(KDE3_LIBS) $(QT3_LIBS) $(AGG_LIBS)
-kde3_gnash_SOURCES += kde_glue_agg.cpp kde_glue_agg.h \
- kde.cpp kdesup.h kde_glue.h
+kde3_gnash_SOURCES += kde/kde_glue_agg.cpp \
+ kde/kde_glue_agg.h \
+ kde/kde.cpp \
+ kde/kdesup.h \
+ kde/kde_glue.h
endif
endif
=== renamed file 'gui/am-frag/kde4.am' => 'gui/kde/kde4.am'
--- a/gui/am-frag/kde4.am 2010-03-22 20:48:47 +0000
+++ b/gui/kde/kde4.am 2010-07-15 03:07:54 +0000
@@ -20,29 +20,34 @@
#
if BUILD_KDE4_GUI
-Kde4Gui.moc: $(srcdir)/Kde4Gui.h
+Kde4Gui.moc: $(srcdir)/kde/Kde4Gui.h
@if test x"$(MOC4)" != x; then \
echo "Generating MOC file: Kde4Gui.moc."; \
- $(MOC4) $(srcdir)/Kde4Gui.h -o Kde4Gui.moc; \
+ $(MOC4) $(srcdir)/kde/Kde4Gui.h -o Kde4Gui.moc; \
else \
echo "WARNING: Install QT 4.x moc tool! Using default MOC file"; \
- ln -sf $(srcdir)/Kde4Gui.moc.in Kde4Gui.moc; \
+ ln -sf $(srcdir)/kde/Kde4Gui.moc.in Kde4Gui.moc; \
fi
-Kde4Glue.moc: $(srcdir)/Kde4Glue.h
+Kde4Glue.moc: $(srcdir)/kde/Kde4Glue.h
@if test x"$(MOC4)" != x; then \
echo "Generating MOC file: Kde4Glue.moc."; \
- $(MOC4) $(srcdir)/Kde4Glue.h -o Kde4Glue.moc; \
+ $(MOC4) $(srcdir)/kde/Kde4Glue.h -o Kde4Glue.moc; \
else \
echo "WARNING: Install QT 4.x moc tool! Using default MOC file"; \
- ln -sf $(srcdir)/Kde4Glue.moc.in Kde4Glue.moc; \
+ ln -sf $(srcdir)/kde/Kde4Glue.moc.in Kde4Glue.moc; \
fi
endif
bin_PROGRAMS += kde4-gnash
-kde4_gnash_SOURCES = $(GUI_SRCS) GuiKde4.cpp Kde4Gui.cpp Kde4Glue.cpp
Kde4Gui.h Kde4Glue.h
+kde4_gnash_SOURCES = $(GUI_SRCS) \
+ kde/GuiKde4.cpp \
+ kde/Kde4Gui.cpp \
+ kde/Kde4Glue.cpp \
+ kde/Kde4Gui.h \
+ kde/Kde4Glue.h
kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS)
$(KDE4_CFLAGS) $(QT4_CFLAGS)
kde4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
@@ -52,19 +57,19 @@
kde4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
kde4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(QT4_LIBS) $(OGL_LIBS) -lQtOpenGL
-kde4_gnash_SOURCES += Kde4GlueOgl.cpp Kde4GlueOgl.h
+kde4_gnash_SOURCES += kde/Kde4GlueOgl.cpp kde/Kde4GlueOgl.h
endif # BUILD_OGL_RENDERER
if BUILD_CAIRO_RENDERER
kde4_gnash_CPPFLAGS += $(CAIRO_CFLAGS) $(X11_CFLAGS)
kde4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(QT4_LIBS) $(CAIRO_LIBS)
-kde4_gnash_SOURCES += Kde4GlueCairo.cpp Kde4GlueCairo.h
+kde4_gnash_SOURCES += kde/Kde4GlueCairo.cpp kde/Kde4GlueCairo.h
endif # BUILD_CAIRO_RENDERER
if BUILD_AGG_RENDERER
kde4_gnash_CPPFLAGS += $(AGG_CFLAGS) $(X11_CFLAGS)
kde4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(QT4_LIBS) $(AGG_LIBS)
-kde4_gnash_SOURCES += Kde4GlueAgg.cpp Kde4GlueAgg.h
+kde4_gnash_SOURCES += kde/Kde4GlueAgg.cpp kde/Kde4GlueAgg.h
endif
=== renamed file 'gui/kde_glue.h' => 'gui/kde/kde_glue.h'
=== renamed file 'gui/kde_glue_agg.cpp' => 'gui/kde/kde_glue_agg.cpp'
=== renamed file 'gui/kde_glue_agg.h' => 'gui/kde/kde_glue_agg.h'
=== renamed file 'gui/kde_glue_opengl.cpp' => 'gui/kde/kde_glue_opengl.cpp'
=== renamed file 'gui/kde_glue_opengl.h' => 'gui/kde/kde_glue_opengl.h'
=== renamed file 'gui/kdesup.h' => 'gui/kde/kdesup.h'
=== renamed file 'gui/klash3.moc.in' => 'gui/kde/klash3.moc.in'
=== renamed file 'gui/am-frag/qtopia3.am' => 'gui/kde/qtopia3.am'
--- a/gui/am-frag/qtopia3.am 2010-03-11 03:27:57 +0000
+++ b/gui/kde/qtopia3.am 2010-07-15 03:07:54 +0000
@@ -23,7 +23,7 @@
qtopia_gnash_CPPFLAGS = -DGUI_QTOPIA -DGUI_CONFIG=\"QTOPIA\" \
$(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
-qtopia_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
+qtopia_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp
qtopia_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#qtopia_gnash_DEPENDENCIES = .configline
qtopia_gnash_LDADD = \
@@ -34,15 +34,15 @@
qtopia_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
qtopia_gnash_LDADD += $(top_builddir)/librender/libgnashogl.la \
$(KDE_LIBS) $(QTOPIA_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
-qtopia_gnash_SOURCES += kde_glue_opengl.cpp kde_glue_opengl.h kde_glue.h \
- kde.cpp kdesup.h kde_glue.h
+qtopia_gnash_SOURCES += kde/kde_glue_opengl.cpp kde/kde_glue_opengl.h
kde/kde_glue.h \
+ kde/kde.cpp kde/kdesup.h kde/kde_glue.h
endif
if BUILD_AGG_RENDERER
qtopia_gnash_CPPFLAGS += $(AGG_CFLAGS)
qtopia_gnash_LDADD += $(top_builddir)/librender/libgnashagg.la \
$(KDE_LIBS) $(QTOPIA_LIBS) $(QT_LIBS) $(AGG_LIBS)
-qtopia_gnash_SOURCES += kde_glue_agg.cpp kde_glue_agg.h \
- kde.cpp kdesup.h kde_glue.h
+qtopia_gnash_SOURCES += kde/kde_glue_agg.cpp kde/kde_glue_agg.h \
+ kde/kde.cpp kde/kdesup.h kde/kde_glue.h
endif
endif
=== modified file 'gui/pythonmod/Makefile.am'
--- a/gui/pythonmod/Makefile.am 2010-03-14 02:26:46 +0000
+++ b/gui/pythonmod/Makefile.am 2010-07-15 03:07:54 +0000
@@ -20,6 +20,7 @@
GNASH_INCLUDES = \
-I$(top_srcdir)/gui \
+ -I$(top_srcdir)/gui/gtk \
-I$(top_srcdir)/gui/pythonmod \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/librender \
@@ -60,18 +61,18 @@
inst_HEADERS = gnash-view.h
if BUILD_OGL_RENDERER
-RENDERER_GLUE = $(top_srcdir)/gui/gtk_glue_gtkglext.cpp
+RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_gtkglext.cpp
INCLUDES += $(GLEXT_CFLAGS)
endif
if BUILD_AGG_RENDERER
-RENDERER_GLUE = $(top_srcdir)/gui/gtk_glue_agg.cpp
+RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_agg.cpp
if HAVE_XV
-RENDERER_GLUE += $(top_srcdir)/gui/gtk_glue_agg_xv.cpp
+RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_agg_xv.cpp
gnash_la_LIBADD += $(X11_LIBS)
endif # HAVE_XV
endif
if BUILD_CAIRO_RENDERER
-RENDERER_GLUE = $(top_srcdir)/gui/gtk_glue_cairo.cpp
+RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_cairo.cpp
endif
if USE_PYTHON
@@ -84,7 +85,7 @@
gnash_la_SOURCES = \
gnashmodule.c \
gnash-view.cpp \
- $(top_srcdir)/gui/gtk_canvas.cpp \
+ $(top_srcdir)/gui/gtk/gtk_canvas.cpp \
$(RENDERER_GLUE)
gnash.c: gnash.defs gnash.override
=== added directory 'gui/sdl'
=== renamed file 'gui/gui_sdl.cpp' => 'gui/sdl/gui_sdl.cpp'
=== renamed file 'gui/am-frag/sdl.am' => 'gui/sdl/sdl.am'
--- a/gui/am-frag/sdl.am 2010-03-15 18:17:54 +0000
+++ b/gui/sdl/sdl.am 2010-07-15 03:07:54 +0000
@@ -22,7 +22,11 @@
bin_PROGRAMS += sdl-gnash
sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
$(AM_CPPFLAGS) $(SDL_CFLAGS)
-sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
+sdl_gnash_SOURCES = $(GUI_SRCS) \
+ sdl/gui_sdl.cpp \
+ sdl/sdl.cpp \
+ sdl/sdlsup.h \
+ sdl/sdl_glue.h
sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#sdl_gnash_DEPENDENCIES = .configline
sdl_gnash_LDADD = \
@@ -35,18 +39,18 @@
if BUILD_OGL_RENDERER
sdl_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
sdl_gnash_LDADD += $(OPENGL_LIBS)
-sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h
+sdl_gnash_SOURCES += sdl/sdl_ogl_glue.cpp sdl/sdl_ogl_glue.h
endif
if BUILD_AGG_RENDERER
sdl_gnash_CPPFLAGS += $(AGG_CFLAGS)
sdl_gnash_LDADD += $(AGG_LIBS)
-sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h
+sdl_gnash_SOURCES += sdl/sdl_agg_glue.cpp sdl/sdl_agg_glue.h
endif
if BUILD_CAIRO_RENDERER
sdl_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
sdl_gnash_LDADD += $(CAIRO_LIBS)
-sdl_gnash_SOURCES += sdl_cairo_glue.cpp sdl_cairo_glue.h
+sdl_gnash_SOURCES += sdl/sdl_cairo_glue.cpp sdl/sdl_cairo_glue.h
endif
endif
=== renamed file 'gui/sdl.cpp' => 'gui/sdl/sdl.cpp'
=== renamed file 'gui/sdl_agg_glue.cpp' => 'gui/sdl/sdl_agg_glue.cpp'
=== renamed file 'gui/sdl_agg_glue.h' => 'gui/sdl/sdl_agg_glue.h'
=== renamed file 'gui/sdl_cairo_glue.cpp' => 'gui/sdl/sdl_cairo_glue.cpp'
=== renamed file 'gui/sdl_cairo_glue.h' => 'gui/sdl/sdl_cairo_glue.h'
=== renamed file 'gui/sdl_glue.h' => 'gui/sdl/sdl_glue.h'
=== renamed file 'gui/sdl_ogl_glue.cpp' => 'gui/sdl/sdl_ogl_glue.cpp'
=== renamed file 'gui/sdl_ogl_glue.h' => 'gui/sdl/sdl_ogl_glue.h'
=== renamed file 'gui/sdlsup.h' => 'gui/sdl/sdlsup.h'
- [Gnash-commit] /srv/bzr/gnash/trunk r12305: reorganize gui files into sub-directories, no other changes.,
Rob Savoye <=