[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11868: Restrict cflags as much as p
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11868: Restrict cflags as much as possible to prevent dependency creep. |
Date: |
Wed, 03 Feb 2010 15:33:47 +0100 |
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11868 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-03 15:33:47 +0100
message:
Restrict cflags as much as possible to prevent dependency creep.
added:
libbase/FileTypes.h
renamed:
libcore/StringPredicates.h => libbase/StringPredicates.h
modified:
backend/Renderer.h
libbase/GnashImage.cpp
libbase/GnashImage.h
libbase/Makefile.am
libcore/Makefile.am
libcore/gnash.h
libcore/swf/DefineFontAlignZonesTag.h
libmedia/FLVParser.cpp
libmedia/Makefile.am
testsuite/libcore.all/EdgeTest.cpp
=== modified file 'backend/Renderer.h'
--- a/backend/Renderer.h 2010-01-27 13:24:59 +0000
+++ b/backend/Renderer.h 2010-02-03 12:23:38 +0000
@@ -146,6 +146,7 @@
#include "dsodefs.h" // for DSOEXPORT
+#include "FileTypes.h"
#include "gnash.h" // Quality
#include "DisplayObject.h"
#include "Range2d.h"
=== added file 'libbase/FileTypes.h'
--- a/libbase/FileTypes.h 1970-01-01 00:00:00 +0000
+++ b/libbase/FileTypes.h 2010-02-03 12:23:38 +0000
@@ -0,0 +1,36 @@
+//
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+// Foundation, Inc
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#ifndef GNASH_FILETYPES_H
+#define GNASH_FILETYPES_H
+
+namespace gnash {
+
+// The file types that Gnash can handle
+enum FileType {
+ GNASH_FILETYPE_JPEG,
+ GNASH_FILETYPE_PNG,
+ GNASH_FILETYPE_GIF,
+ GNASH_FILETYPE_SWF,
+ GNASH_FILETYPE_FLV,
+ GNASH_FILETYPE_UNKNOWN
+};
+
+}
+
+#endif
=== modified file 'libbase/GnashImage.cpp'
--- a/libbase/GnashImage.cpp 2010-01-27 13:24:59 +0000
+++ b/libbase/GnashImage.cpp 2010-02-03 12:23:38 +0000
@@ -25,7 +25,7 @@
#include <boost/scoped_array.hpp>
#include <boost/shared_ptr.hpp>
-#include "gnash.h" // for image file types
+#include "FileTypes.h"
#include "GnashImage.h"
#ifdef USE_PNG
# include "GnashImagePng.h"
=== modified file 'libbase/GnashImage.h'
--- a/libbase/GnashImage.h 2010-01-29 11:26:32 +0000
+++ b/libbase/GnashImage.h 2010-02-03 12:23:38 +0000
@@ -30,7 +30,7 @@
#include <boost/scoped_array.hpp>
#include <memory> // for auto_ptr
-#include "gnash.h" // for image file types
+#include "FileTypes.h"
#include "log.h"
#include "dsodefs.h"
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2010-01-25 02:27:36 +0000
+++ b/libbase/Makefile.am 2010-02-03 12:23:38 +0000
@@ -28,10 +28,6 @@
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
-I$(top_srcdir)/libltdl \
$(PTHREAD_CFLAGS) \
$(PNG_CFLAGS) \
@@ -46,7 +42,6 @@
$(NULL)
# These headers get installed
-# include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
libgnashbase_la_LIBADD = \
$(JPEG_LIBS) \
@@ -167,6 +162,8 @@
endif
EXTENSIONS_API = \
+ StringPredicates.h \
+ FileTypes.h \
smart_ptr.h \
string_table.h \
ref_counted.h \
=== renamed file 'libcore/StringPredicates.h' => 'libbase/StringPredicates.h'
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2010-01-30 17:47:59 +0000
+++ b/libcore/Makefile.am 2010-02-03 12:23:38 +0000
@@ -236,7 +236,6 @@
as_value.h \
PropFlags.h \
CharacterProxy.h \
- StringPredicates.h \
builtin_function.h \
NativeFunction.h \
as_function.h \
=== modified file 'libcore/gnash.h'
--- a/libcore/gnash.h 2010-01-11 06:41:38 +0000
+++ b/libcore/gnash.h 2010-02-03 12:23:38 +0000
@@ -40,16 +40,6 @@
namespace gnash {
-// The file types that Gnash can handle
-enum FileType {
- GNASH_FILETYPE_JPEG,
- GNASH_FILETYPE_PNG,
- GNASH_FILETYPE_GIF,
- GNASH_FILETYPE_SWF,
- GNASH_FILETYPE_FLV,
- GNASH_FILETYPE_UNKNOWN
-};
-
/// The display quality.
//
/// Required for rendering and core.
=== modified file 'libcore/swf/DefineFontAlignZonesTag.h'
--- a/libcore/swf/DefineFontAlignZonesTag.h 2010-01-25 18:52:20 +0000
+++ b/libcore/swf/DefineFontAlignZonesTag.h 2010-02-03 12:23:38 +0000
@@ -24,6 +24,7 @@
namespace gnash {
class movie_definition;
class SWFStream;
+ class RunResources;
}
namespace gnash {
=== modified file 'libmedia/FLVParser.cpp'
--- a/libmedia/FLVParser.cpp 2010-01-01 17:48:26 +0000
+++ b/libmedia/FLVParser.cpp 2010-02-03 12:23:38 +0000
@@ -19,16 +19,12 @@
#include "FLVParser.h"
-#include "amf.h"
-#include "element.h"
-#include "flv.h"
#include "log.h"
#include "utility.h"
#include "GnashException.h"
#include "IOChannel.h"
#include "SimpleBuffer.h"
#include "GnashAlgorithm.h"
-#include "element.h"
#include <string>
#include <iosfwd>
=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am 2010-01-14 23:45:43 +0000
+++ b/libmedia/Makefile.am 2010-02-03 12:23:38 +0000
@@ -30,10 +30,7 @@
pkglib_LTLIBRARIES = libgnashmedia.la
libgnashmedia_la_CPPFLAGS = \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libnet \
-I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libcore \
$(PTHREAD_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(OPENGL_CFLAGS) \
=== modified file 'testsuite/libcore.all/EdgeTest.cpp'
--- a/testsuite/libcore.all/EdgeTest.cpp 2010-01-11 06:41:38 +0000
+++ b/testsuite/libcore.all/EdgeTest.cpp 2010-02-03 12:23:38 +0000
@@ -20,7 +20,6 @@
#include "gnashconfig.h"
#endif
-#include "gnash.h" // for point !!
#include "Geometry.h" // for edge
#include <iostream>
#include <sstream>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11868: Restrict cflags as much as possible to prevent dependency creep.,
Benjamin Wolsey <=