Mercurial > audlegacy
changeset 1693:8d7f4260022d trunk
[svn] * One more .cpp -> .cxx
* Changed sinclude -> include for OpenBSD make compatibility
* Removed check for MAKE_VERSION for OpenBSD make compatibility
* Added myself to the credits (ok by nenolod)
| author | js |
|---|---|
| date | Thu, 14 Sep 2006 13:56:35 -0700 |
| parents | 2dd4cf103e1c |
| children | 02d3d6d7f223 |
| files | ChangeLog Makefile Plugins/Input/mpg123/tag_c_hacked.cpp Plugins/Input/mpg123/tag_c_hacked.cxx audacious/credits.c mk/objective.mk |
| diffstat | 6 files changed, 25 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 14 13:38:05 2006 -0700 +++ b/ChangeLog Thu Sep 14 13:56:35 2006 -0700 @@ -1,3 +1,12 @@ +2006-09-14 20:38:05 +0000 Jonathan Schleifer <js@h3c.de> + revision [2321] + Forgot to change .cpp -> .cxx in the Makefile.in. Shame on me... + + + Changes: Modified: + +35 -35 trunk/Plugins/Input/console/Makefile.in + + 2006-09-14 20:33:10 +0000 Jonathan Schleifer <js@h3c.de> revision [2319] .cpp -> .cxx
--- a/Makefile Thu Sep 14 13:38:05 2006 -0700 +++ b/Makefile Thu Sep 14 13:56:35 2006 -0700 @@ -1,6 +1,6 @@ .SILENT: -sinclude mk/rules.mk +include mk/rules.mk include mk/init.mk SUBDIRS = Plugins libaudacious intl $(SUBDIR_GUESS) sqlite audacious audtool po icons skin
--- a/Plugins/Input/mpg123/tag_c_hacked.cpp Thu Sep 14 13:38:05 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -#include <tag.h> -#include <id3v2framefactory.h> - -extern "C" -{ -#include "tag_c_hacked.h" -} -using namespace TagLib; -using namespace ID3v2; -void taglib_set_id3v2_default_text_encoding() -{ - TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8); -} -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Input/mpg123/tag_c_hacked.cxx Thu Sep 14 13:56:35 2006 -0700 @@ -0,0 +1,14 @@ +#include <tag.h> +#include <id3v2framefactory.h> + +extern "C" +{ +#include "tag_c_hacked.h" +} +using namespace TagLib; +using namespace ID3v2; +void taglib_set_id3v2_default_text_encoding() +{ + TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8); +} +
--- a/audacious/credits.c Thu Sep 14 13:38:05 2006 -0700 +++ b/audacious/credits.c Thu Sep 14 13:56:35 2006 -0700 @@ -55,6 +55,7 @@ "Derek Pomery", "Tony Vroon", "Yoshiki Yazawa", + "Jonathan Schleifer", NULL, N_("Graphics:"),
--- a/mk/objective.mk Thu Sep 14 13:38:05 2006 -0700 +++ b/mk/objective.mk Thu Sep 14 13:56:35 2006 -0700 @@ -104,11 +104,6 @@ fi build: - # test for GNU make - @if [ ! "$(MAKE_VERSION)" ]; then \ - echo "[Your make is not properly supported, please use GNU make or BSD make.]"; \ - exit 1; \ - fi; $(MAKE) build-prehook @if [ "x$(SUBDIRS)" != "x" ]; then \ for i in $(SUBDIRS); do \