changeset 1679:2dab9da1abc4 trunk

[svn] Link C++ plugins correctly on *BSD, by Jonathan Schleifer <js@h3c.de>.
author chainsaw
date Wed, 13 Sep 2006 11:03:25 -0700
parents a1d6143827df
children 92b4af21e6d2
files ChangeLog Plugins/Input/modplug/gui/support.h audacious/Makefile
diffstat 3 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 13 09:40:07 2006 -0700
+++ b/ChangeLog	Wed Sep 13 11:03:25 2006 -0700
@@ -1,3 +1,14 @@
+2006-09-13 16:40:07 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2293]
+  Remove built-in soundcard.h silliness so OSS actually works on *BSD, by Jonathan Schleifer <js@h3c.de>.
+
+  Changes:        Modified:
+  +5 -1           trunk/Plugins/Input/cdaudio/cdaudio.h  
+  +6 -1           trunk/Plugins/Output/OSS/OSS.h  
+  +0 -1695        trunk/Plugins/Output/OSS/soundcard.h  
+  +5 -1           trunk/Plugins/Output/esd/mixer.c  
+
+
 2006-09-13 16:05:18 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2291]
   Mark autogen.sh executable.
--- a/Plugins/Input/modplug/gui/support.h	Wed Sep 13 09:40:07 2006 -0700
+++ b/Plugins/Input/modplug/gui/support.h	Wed Sep 13 11:03:25 2006 -0700
@@ -11,7 +11,7 @@
 /*
  * Standard gettext macros.
  */
-#ifdef ENABLE_NLS
+#if defined ENABLE_NLS && !defined __NetBSD__
 #  include <libintl.h>
 #  undef _
 #  define _(String) dgettext (PACKAGE, String)
--- a/audacious/Makefile	Wed Sep 13 09:40:07 2006 -0700
+++ b/audacious/Makefile	Wed Sep 13 11:03:25 2006 -0700
@@ -90,5 +90,5 @@
 	fi;
 
 audacious: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ 
+	$(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ 
 	@printf "%10s     %-20s\n" LINK $@