Mercurial > audlegacy
changeset 1631:20ff61083530 trunk
[svn] - make audtool build
- make plugins work
| author | nenolod |
|---|---|
| date | Wed, 06 Sep 2006 14:46:09 -0700 |
| parents | 842667773cc0 |
| children | 978ada910173 |
| files | ChangeLog audacious/pluginenum.c audtool/Makefile configure.ac |
| diffstat | 4 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 06 14:21:40 2006 -0700 +++ b/ChangeLog Wed Sep 06 14:46:09 2006 -0700 @@ -1,3 +1,15 @@ +2006-09-06 21:21:40 +0000 William Pitcock <nenolod@nenolod.net> + revision [2191] + - audacious now builds on OS X + + + Changes: Modified: + +5 -2 trunk/audacious/Makefile + +8 -2 trunk/configure.ac + +2 -0 trunk/libaudacious/Makefile.in + +2 -0 trunk/mk/rules.mk.in + + 2006-09-06 21:01:53 +0000 William Pitcock <nenolod@nenolod.net> revision [2189] - they fucking say I'm nuts
--- a/audacious/pluginenum.c Wed Sep 06 14:21:40 2006 -0700 +++ b/audacious/pluginenum.c Wed Sep 06 14:46:09 2006 -0700 @@ -23,6 +23,10 @@ # include "config.h" #endif +#ifndef SHARED_SUFFIX +# define SHARED_SUFFIX G_MODULE_SUFFIX +#endif + #include "pluginenum.h" #include <glib.h> @@ -238,7 +242,7 @@ static gboolean scan_plugin_func(const gchar * path, const gchar * basename, gpointer data) { - if (!str_has_suffix_nocase(basename, G_MODULE_SUFFIX)) + if (!str_has_suffix_nocase(basename, SHARED_SUFFIX)) return FALSE; if (!g_file_test(path, G_FILE_TEST_IS_REGULAR))
--- a/audtool/Makefile Wed Sep 06 14:21:40 2006 -0700 +++ b/audtool/Makefile Wed Sep 06 14:46:09 2006 -0700 @@ -6,9 +6,8 @@ OBJECTIVE_BINS = audtool -LDFLAGS += -Wl,-export-dynamic +LDFLAGS += $(AUDLDFLAGS) LDADD = \ - -L.. $(LTLIBINTL) \ -L../libaudacious -laudacious \ $(GTK_LIBS) \ $(LIBGLADE_LIBS) @@ -26,5 +25,5 @@ OBJECTS = ${SOURCES:.c=.o} audtool: $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir} + $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ @printf "%10s %-20s\n" LINK $@
--- a/configure.ac Wed Sep 06 14:21:40 2006 -0700 +++ b/configure.ac Wed Sep 06 14:46:09 2006 -0700 @@ -215,6 +215,8 @@ AC_SUBST(LIBLDFLAGS) AC_SUBST(AUDLDFLAGS) AC_SUBST(SHARED_SUFFIX) +AC_DEFINE(SHARED_SUFFIX, "\"$SHARED_SUFFIX\"", + [Define the shared module suffix extension on your platform.]) AC_MSG_CHECKING([if you are running Apple-GCC]) case "$target" in