From 4b6fee00fce4641187f8a8fde5145bf29410a631 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 12 May 2006 08:31:36 +0000 Subject: [PATCH] Work in progress, dynamically loading SMPEG --- CHANGES | 2 ++ configure.in | 25 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index c2941bb1..eb5c697a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ 1.2.7: +Sam Lantinga - Fri May 12 00:04:32 PDT 2006 + * Added support for dynamically loading SMPEG library Sam Lantinga - Thu May 11 22:22:43 PDT 2006 * Added support for dynamically loading Ogg Vorbis library Sam Lantinga - Sun Apr 30 09:01:44 PDT 2006 diff --git a/configure.in b/configure.in index 1409ac17..70627cdb 100644 --- a/configure.in +++ b/configure.in @@ -264,8 +264,31 @@ if test x$enable_music_mp3 = xyes; then SMPEG_VERSION=0.4.3 AM_PATH_SMPEG($SMPEG_VERSION, have_smpeg=yes, have_smpeg=no) if test x$have_smpeg = xyes; then + AC_ARG_ENABLE([music-mp3-shared], +AC_HELP_STRING([--enable-music-mp3-shared], [dynamically load MP3 support [[default=no]]]), + [], [enable_music_mp3_shared=no]) + case "$host" in + *-*-darwin*) + smpeg_lib='' + ;; + *-*-cygwin* | *-*-mingw32*) + smpeg_lib='smpeg.dll' + ;; + *) + for path in /usr/lib /usr/local/lib; do + if test x$smpeg_lib = x; then + smpeg_lib=[`ls -- $path/libsmpeg*.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`] + fi + done + ;; + esac EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS" + if test x$enable_music_mp3_shared = xyes && test x$smpeg_lib != x; then + echo "-- dynamic libsmpeg -> $smpeg_lib" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_DYNAMIC=\\\"$smpeg_lib\\\"" + else + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS" + fi fi fi