[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 135d3b33ce2e06ead860
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 135d3b33ce2e06ead8607f310930c5a5f4b089bf |
Date: |
Fri, 19 Nov 2010 13:34:45 +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 135d3b33ce2e06ead8607f310930c5a5f4b089bf (commit)
via 1e2a4f334637494a59d1e70b944200def591b62b (commit)
from 84a5cd7ce35b3382ca1b6e8a0c2cceb0f9c42bc4 (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=135d3b33ce2e06ead8607f310930c5a5f4b089bf
commit 135d3b33ce2e06ead8607f310930c5a5f4b089bf
Merge: 1e2a4f3 84a5cd7
Author: Benjamin Wolsey <address@hidden>
Date: Fri Nov 19 14:34:35 2010 +0100
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=1e2a4f334637494a59d1e70b944200def591b62b
commit 1e2a4f334637494a59d1e70b944200def591b62b
Author: Benjamin Wolsey <address@hidden>
Date: Fri Nov 19 13:57:28 2010 +0100
Drop commented out code.
diff --git a/libcore/asobj/flash.am b/libcore/asobj/flash.am
index d78394f..e0fd409 100644
--- a/libcore/asobj/flash.am
+++ b/libcore/asobj/flash.am
@@ -23,8 +23,6 @@ VPATH += $(srcdir)/asobj/
# class. The header file is generated at build time.
BUILT_SOURCES =
-# pkglib_LTLIBRARIES += libgnashasobjs.la
-
libgnashasobjs_la_SOURCES = \
asobj/ASConversions.cpp \
asobj/AsBroadcaster.cpp \
@@ -110,24 +108,6 @@ EXTENSIONS_API += \
asobj/Key_as.h \
$(NULL)
-# libgnashasobjs_la_LIBADD = \
-# $(top_builddir)/libbase/libgnashbase.la
-
-# if USE_FFMPEG_ENGINE
-# AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
-# $(SDL_CFLAGS) \
-# -I$(top_srcdir)/libmedia/ffmpeg
-# libgnashasobjs_la_LIBADD += $(FFMPEG_LIBS) \
-# $(SDL_LIBS)
-# endif
-
-# if USE_GST_ENGINE
-# AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
-# -I$(top_srcdir)/libmedia/gst
-# libgnashasobjs_la_LIBADD += $(GSTREAMER_LIBS) \
-# $(SDL_LIBS)
-# endif
-
# These makefile fragments build the ActionScript library for
# Gnash, and supports both AS2 as well as AS3, so we always
# want to build.
@@ -146,9 +126,3 @@ noinst_HEADERS += \
asobj/flash/flash_pkg.h \
$(NULL)
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-# if WIN32
-# libgnashasobjs_la_LDFLAGS = -no-undefined
-# endif
-
-----------------------------------------------------------------------
Summary of changes:
libcore/asobj/flash.am | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 135d3b33ce2e06ead8607f310930c5a5f4b089bf,
Benjamin Wolsey <=