[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 7c3c385e28106f1a52bc
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 7c3c385e28106f1a52bc80a3a83e2a98f17a7890 |
|
Date: |
Mon, 25 Oct 2010 21:42:34 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 7c3c385e28106f1a52bc80a3a83e2a98f17a7890 (commit)
via 5419e97139255090efc0470030f121e0309004eb (commit)
from d3cc9fff712c890b2fb7e833de4e95bc0dd521a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=7c3c385e28106f1a52bc80a3a83e2a98f17a7890
commit 7c3c385e28106f1a52bc80a3a83e2a98f17a7890
Merge: 5419e97 d3cc9ff
Author: Sandro Santilli <address@hidden>
Date: Mon Oct 25 23:42:29 2010 +0200
Merge branch 'master' of ssh://address@hidden/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=5419e97139255090efc0470030f121e0309004eb
commit 5419e97139255090efc0470030f121e0309004eb
Author: Sandro Santilli <address@hidden>
Date: Mon Oct 25 23:42:06 2010 +0200
Each gui to its subdir !
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 27643e3..3093ea8 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -148,24 +148,6 @@ endif
# endif # DYNAMIC_GUI
-# AQUA Toolkit
-if BUILD_AQUA_GUI
-#OS X stuff goes here...
-GUI_CPPFLAGS += -DGUI_AQUA
-
-bundle_name = Gnash.app
-
-if HAVE_OPENGL
-noinst_LTLIBRARIES += libgnashaqua_ogl.la
-libgnashaqua_ogl_la_CPPFLAGS = $(AM_CPPFLAGS) \
- $(OPENGL_CFLAGS)
-libgnashaqua_ogl_la_SOURCES = \
- aqua_ogl_glue.cpp aqua_ogl_glue.h \
- aqua.cpp aquasup.h aqua_glue.h
-libgnashaqua_ogl_la_LDFLAGS = $(LIB_FLAGS)
-libgnashaqua_ogl_la_LIBADD =
-endif # HAVE_OPENGL
-endif # BUILD_AQUA_GUI
if USE_FFMPEG_ENGINE
AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS)
@@ -262,7 +244,7 @@ endif
# Build the AQUA gui
if BUILD_AQUA_GUI
-include $(srcdir)/am-frag/aqua.am
+include $(srcdir)/aqua/aqua.am
endif
# Build the GTK gui
@@ -272,7 +254,7 @@ endif
# Build the DUMP gui
if BUILD_DUMP_GUI
-include $(srcdir)/am-frag/dump.am
+include $(srcdir)/dump/dump.am
endif
# Build the FB gui
@@ -282,7 +264,7 @@ endif
# Build the RISCOS gui
if BUILD_RISCOS_GUI
-include $(srcdir)/am-frag/riscos.am
+include $(srcdir)/riscos/riscos.am
endif
CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc .configline gnash
diff --git a/gui/am-frag/aqua.am b/gui/aqua/aqua.am
similarity index 73%
rename from gui/am-frag/aqua.am
rename to gui/aqua/aqua.am
index 7f0763e..127dddd 100644
--- a/gui/am-frag/aqua.am
+++ b/gui/aqua/aqua.am
@@ -21,20 +21,35 @@
if BUILD_AQUA_GUI
bin_PROGRAMS += aqua-gnash
aqua_gnash_CPPFLAGS = -DGUI_AQUA $(AM_CPPFLAGS) -DGUI_CONFIG=\"AQUA\"
-aqua_gnash_SOURCES = $(GUI_SRCS) gui_aqua.cpp
+aqua_gnash_SOURCES = $(GUI_SRCS) aqua/gui_aqua.cpp
aqua_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#aqua_gnash_DEPENDENCIES = .configline
aqua_gnash_LDADD = \
$(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS)
+
if BUILD_OGL_RENDERER
aqua_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
aqua_gnash_LDADD += $(top_builddir)/librender/libgnashogl.la \
$(AQUA_LIBS) $(OPENGL_LIBS)
-aqua_gnash_SOURCES += aqua_ogl_glue.cpp aqua_ogl_glue.h \
- aqua.cpp aquasup.h aqua_glue.h
+aqua_gnash_SOURCES += aqua/aqua_ogl_glue.cpp aqua/aqua_ogl_glue.h \
+ aqua/aqua.cpp aqua/aquasup.h aqua/aqua_glue.h
endif
+
+bundle_name = Gnash.app
+
+if HAVE_OPENGL
+noinst_LTLIBRARIES += libgnashaqua_ogl.la
+libgnashaqua_ogl_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ $(OPENGL_CFLAGS)
+libgnashaqua_ogl_la_SOURCES = \
+ aqua/aqua_ogl_glue.cpp aqua/aqua_ogl_glue.h \
+ aqua/aqua.cpp aqua/aquasup.h aqua/aqua_glue.h
+libgnashaqua_ogl_la_LDFLAGS = $(LIB_FLAGS)
+libgnashaqua_ogl_la_LIBADD =
+endif # HAVE_OPENGL
+
# if BUILD_AGG_RENDERER
# aqua_gnash_CPPFLAGS += $(AGG_CFLAGS)
# aqua_gnash_LDADD += $(top_builddir)/librender/libgnashagg.la \
@@ -42,4 +57,5 @@ endif
# aqua_gnash_SOURCES += aqua_agg_glue.cpp aqua_agg_glue.h \
# aqua.cpp aquasup.h aqua_glue.h
# endif
+
endif
diff --git a/gui/aqua.cpp b/gui/aqua/aqua.cpp
similarity index 100%
rename from gui/aqua.cpp
rename to gui/aqua/aqua.cpp
diff --git a/gui/aqua_glue.h b/gui/aqua/aqua_glue.h
similarity index 100%
rename from gui/aqua_glue.h
rename to gui/aqua/aqua_glue.h
diff --git a/gui/aqua_ogl_glue.cpp b/gui/aqua/aqua_ogl_glue.cpp
similarity index 100%
rename from gui/aqua_ogl_glue.cpp
rename to gui/aqua/aqua_ogl_glue.cpp
diff --git a/gui/aqua_ogl_glue.h b/gui/aqua/aqua_ogl_glue.h
similarity index 100%
rename from gui/aqua_ogl_glue.h
rename to gui/aqua/aqua_ogl_glue.h
diff --git a/gui/aquasup.h b/gui/aqua/aquasup.h
similarity index 100%
rename from gui/aquasup.h
rename to gui/aqua/aquasup.h
diff --git a/gui/gui_aqua.cpp b/gui/aqua/gui_aqua.cpp
similarity index 100%
rename from gui/gui_aqua.cpp
rename to gui/aqua/gui_aqua.cpp
diff --git a/gui/am-frag/dump.am b/gui/dump/dump.am
similarity index 93%
rename from gui/am-frag/dump.am
rename to gui/dump/dump.am
index 33f5d3c..8db3d0b 100644
--- a/gui/am-frag/dump.am
+++ b/gui/dump/dump.am
@@ -21,7 +21,7 @@
if BUILD_DUMP_GUI
if BUILD_AGG_RENDERER
bin_PROGRAMS += dump-gnash
-dump_gnash_SOURCES = $(GUI_SRCS) gui_dump.cpp dump.cpp dump.h
+dump_gnash_SOURCES = $(GUI_SRCS) dump/gui_dump.cpp dump/dump.cpp dump/dump.h
dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
$(AM_CPPFLAGS) $(DUMP_CFLAGS) $(AGG_CFLAGS)
dump_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
diff --git a/gui/dump.cpp b/gui/dump/dump.cpp
similarity index 100%
rename from gui/dump.cpp
rename to gui/dump/dump.cpp
diff --git a/gui/dump.h b/gui/dump/dump.h
similarity index 100%
rename from gui/dump.h
rename to gui/dump/dump.h
diff --git a/gui/gui_dump.cpp b/gui/dump/gui_dump.cpp
similarity index 100%
rename from gui/gui_dump.cpp
rename to gui/dump/gui_dump.cpp
diff --git a/gui/EventDevice.cpp b/gui/fb/EventDevice.cpp
similarity index 100%
rename from gui/EventDevice.cpp
rename to gui/fb/EventDevice.cpp
diff --git a/gui/InputDevice.cpp b/gui/fb/InputDevice.cpp
similarity index 100%
rename from gui/InputDevice.cpp
rename to gui/fb/InputDevice.cpp
diff --git a/gui/InputDevice.h b/gui/fb/InputDevice.h
similarity index 100%
rename from gui/InputDevice.h
rename to gui/fb/InputDevice.h
diff --git a/gui/MouseDevice.cpp b/gui/fb/MouseDevice.cpp
similarity index 100%
rename from gui/MouseDevice.cpp
rename to gui/fb/MouseDevice.cpp
diff --git a/gui/TouchDevice.cpp b/gui/fb/TouchDevice.cpp
similarity index 100%
rename from gui/TouchDevice.cpp
rename to gui/fb/TouchDevice.cpp
diff --git a/gui/fb/fb.am b/gui/fb/fb.am
index 31ef349..72f4b60 100644
--- a/gui/fb/fb.am
+++ b/gui/fb/fb.am
@@ -22,19 +22,19 @@
# built source files still get included in the source tarball.
DEVICES =
if ENABLE_INPUT_DEVICES
-DEVICES += InputDevice.cpp InputDevice.h
+DEVICES += fb/InputDevice.cpp fb/InputDevice.h
# Touchscreen
if ENABLE_TSLIB
-DEVICES += TouchDevice.cpp
+DEVICES += fb/TouchDevice.cpp
endif
# PS/2 Mouse
if ENABLE_MOUSE
-DEVICES += MouseDevice.cpp
+DEVICES += fb/MouseDevice.cpp
endif
# Linux input events
if ENABLE_INPUT_EVENTS
-DEVICES += EventDevice.cpp
+DEVICES += fb/EventDevice.cpp
endif
endif
diff --git a/gui/gui_riscos.cpp b/gui/riscos/gui_riscos.cpp
similarity index 100%
rename from gui/gui_riscos.cpp
rename to gui/riscos/gui_riscos.cpp
diff --git a/gui/am-frag/riscos.am b/gui/riscos/riscos.am
similarity index 86%
rename from gui/am-frag/riscos.am
rename to gui/riscos/riscos.am
index 9505397..7408750 100644
--- a/gui/am-frag/riscos.am
+++ b/gui/riscos/riscos.am
@@ -20,7 +20,7 @@
#
if BUILD_RISCOS_GUI
bin_PROGRAMS += riscos-gnash
-riscos_gnash_SOURCES = $(GUI_SRCS) gui_riscos.cpp riscos.cpp riscos_glue.h
riscossup.h
+riscos_gnash_SOURCES = $(GUI_SRCS) riscos/gui_riscos.cpp riscos/riscos.cpp
riscos/riscos_glue.h riscos/riscossup.h
riscos_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
$(AM_CPPFLAGS)
riscos_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
@@ -28,7 +28,7 @@ riscos_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
$(AM_LDFLAGS)
if BUILD_AGG_RENDERER
riscos_gnash_CPPFLAGS += $(AGG_CFLAGS)
-riscos_gnash_SOURCES += riscos_glue_agg.cpp riscos_glue_agg.h
+riscos_gnash_SOURCES += riscos/riscos_glue_agg.cpp riscos/riscos_glue_agg.h
riscos_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
$(GNASH_LIBS) $(AGG_LIBS)
endif # BUILD_AGG_RENDERER
diff --git a/gui/riscos.cpp b/gui/riscos/riscos.cpp
similarity index 100%
rename from gui/riscos.cpp
rename to gui/riscos/riscos.cpp
diff --git a/gui/riscos_glue.h b/gui/riscos/riscos_glue.h
similarity index 100%
rename from gui/riscos_glue.h
rename to gui/riscos/riscos_glue.h
diff --git a/gui/riscos_glue_agg.cpp b/gui/riscos/riscos_glue_agg.cpp
similarity index 100%
rename from gui/riscos_glue_agg.cpp
rename to gui/riscos/riscos_glue_agg.cpp
diff --git a/gui/riscos_glue_agg.h b/gui/riscos/riscos_glue_agg.h
similarity index 100%
rename from gui/riscos_glue_agg.h
rename to gui/riscos/riscos_glue_agg.h
diff --git a/gui/riscossup.h b/gui/riscos/riscossup.h
similarity index 100%
rename from gui/riscossup.h
rename to gui/riscos/riscossup.h
-----------------------------------------------------------------------
Summary of changes:
gui/Makefile.am | 24 +++---------------------
gui/{am-frag => aqua}/aqua.am | 22 +++++++++++++++++++---
gui/{ => aqua}/aqua.cpp | 0
gui/{ => aqua}/aqua_glue.h | 0
gui/{ => aqua}/aqua_ogl_glue.cpp | 0
gui/{ => aqua}/aqua_ogl_glue.h | 0
gui/{ => aqua}/aquasup.h | 0
gui/{ => aqua}/gui_aqua.cpp | 0
gui/{am-frag => dump}/dump.am | 2 +-
gui/{ => dump}/dump.cpp | 0
gui/{ => dump}/dump.h | 0
gui/{ => dump}/gui_dump.cpp | 0
gui/{ => fb}/EventDevice.cpp | 0
gui/{ => fb}/InputDevice.cpp | 0
gui/{ => fb}/InputDevice.h | 0
gui/{ => fb}/MouseDevice.cpp | 0
gui/{ => fb}/TouchDevice.cpp | 0
gui/fb/fb.am | 8 ++++----
gui/{ => riscos}/gui_riscos.cpp | 0
gui/{am-frag => riscos}/riscos.am | 4 ++--
gui/{ => riscos}/riscos.cpp | 0
gui/{ => riscos}/riscos_glue.h | 0
gui/{ => riscos}/riscos_glue_agg.cpp | 0
gui/{ => riscos}/riscos_glue_agg.h | 0
gui/{ => riscos}/riscossup.h | 0
25 files changed, 29 insertions(+), 31 deletions(-)
rename gui/{am-frag => aqua}/aqua.am (73%)
rename gui/{ => aqua}/aqua.cpp (100%)
rename gui/{ => aqua}/aqua_glue.h (100%)
rename gui/{ => aqua}/aqua_ogl_glue.cpp (100%)
rename gui/{ => aqua}/aqua_ogl_glue.h (100%)
rename gui/{ => aqua}/aquasup.h (100%)
rename gui/{ => aqua}/gui_aqua.cpp (100%)
rename gui/{am-frag => dump}/dump.am (93%)
rename gui/{ => dump}/dump.cpp (100%)
rename gui/{ => dump}/dump.h (100%)
rename gui/{ => dump}/gui_dump.cpp (100%)
rename gui/{ => fb}/EventDevice.cpp (100%)
rename gui/{ => fb}/InputDevice.cpp (100%)
rename gui/{ => fb}/InputDevice.h (100%)
rename gui/{ => fb}/MouseDevice.cpp (100%)
rename gui/{ => fb}/TouchDevice.cpp (100%)
rename gui/{ => riscos}/gui_riscos.cpp (100%)
rename gui/{am-frag => riscos}/riscos.am (86%)
rename gui/{ => riscos}/riscos.cpp (100%)
rename gui/{ => riscos}/riscos_glue.h (100%)
rename gui/{ => riscos}/riscos_glue_agg.cpp (100%)
rename gui/{ => riscos}/riscos_glue_agg.h (100%)
rename gui/{ => riscos}/riscossup.h (100%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 7c3c385e28106f1a52bc80a3a83e2a98f17a7890,
Sandro Santilli <=