Mercurial > audlegacy
changeset 833:d17d96d91e7d trunk
[svn] - improve the way the scrobbler plugin is compiled
- use G_MODULE_BIND_LAZY to safely bind plugins dependant on
libaudacious, some libdl implementations hate doing this otherwise
| author | nenolod |
|---|---|
| date | Mon, 13 Mar 2006 19:29:55 -0800 |
| parents | d2db0feae0ca |
| children | 0bb30ec2bce9 |
| files | Plugins/General/scrobbler/Makefile.in Plugins/General/scrobbler/tags/Makefile.in audacious/pluginenum.c |
| diffstat | 3 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/General/scrobbler/Makefile.in Mon Mar 13 14:18:03 2006 -0800 +++ b/Plugins/General/scrobbler/Makefile.in Mon Mar 13 19:29:55 2006 -0800 @@ -1,13 +1,13 @@ include ../../../mk/rules.mk include ../../../mk/objective.mk -SUBDIRS = tags +SUBDIRS = OBJECTIVE_LIBS = libscrobbler.so LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR) -LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS) tags/libmetatag.a +LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS) -laudacious SOURCES = \ fmt.c \ @@ -16,8 +16,17 @@ md5.c \ queue.c \ scrobbler.c \ - xmms_scrobbler.c - + xmms_scrobbler.c \ + tags/tags.c \ + tags/id3v1.c \ + tags/id3v2.c \ + tags/id3genres.c \ + tags/ape.c \ + tags/cdaudio.c \ + tags/itunes.c \ + tags/unicode.c \ + tags/vorbis.c \ + tags/wma.c CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(CURL_CFLAGS) -I../../../intl -I../../..
--- a/Plugins/General/scrobbler/tags/Makefile.in Mon Mar 13 14:18:03 2006 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/objective.mk - -OBJECTIVE_LIBS_NOINST = libmetatag.a - -LIBADD = $(MUSICBRAINZ_LIBS) - -SOURCES = ape.c cdaudio.c id3genres.c id3v1.c id3v2.c itunes.c tags.c \ - unicode.c vorbis.c wma.c - -CFLAGS += -Wno-unused -fPIC -DPIC $(GTK_CFLAGS) $(MUSICBRAINZ_CFLAGS) -I../../../../intl -I../../../.. - -OBJECTS = ${SOURCES:.c=.o}
--- a/audacious/pluginenum.c Mon Mar 13 14:18:03 2006 -0800 +++ b/audacious/pluginenum.c Mon Mar 13 19:29:55 2006 -0800 @@ -199,7 +199,7 @@ if (plugin_is_duplicate(filename)) return; - if (!(module = g_module_open(filename, 0))) { + if (!(module = g_module_open(filename, G_MODULE_BIND_LAZY))) { printf("Failed to load plugin (%s): %s\n", filename, g_module_error()); return;