changeset 1570:85788238cbf5

madplug: remove rpath. PUT THIS IN CONFIGURE.AC. -Wl,rpath= IS NOT PORTABLE. I WILL KEEP REMOVING THIS. madplug: fix symbol collisions
author William Pitcock <nenolod@atheme.org>
date Sun, 02 Sep 2007 22:18:43 -0500
parents 25ea2127eefa
children b83dfdc605d5 5dfa4fc721b0
files src/madplug/Makefile src/madplug/plugin.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/madplug/Makefile	Sun Sep 02 22:01:45 2007 -0500
+++ b/src/madplug/Makefile	Sun Sep 02 22:18:43 2007 -0500
@@ -20,6 +20,6 @@
 CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(SIMD_CFLAGS) -I../../intl -I../.. -Wall
 
 LDFLAGS += $(AUDLDFLAGS)
-LIBADD = -L/opt/local/lib -L$(plugindir) -Wl,-rpath=$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+LIBADD = -L/opt/local/lib -L$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk
--- a/src/madplug/plugin.h	Sun Sep 02 22:01:45 2007 -0500
+++ b/src/madplug/plugin.h	Sun Sep 02 22:18:43 2007 -0500
@@ -128,8 +128,8 @@
 };
 
 // global variables
-InputPlugin *mad_plugin;
-struct audmad_config_t audmad_config;
+extern InputPlugin *mad_plugin;
+extern struct audmad_config_t audmad_config;
 
 // gcond
 extern GMutex *mad_mutex;