encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed attempting to dynamically load libsamplerate when shared object loading is disabled. 

Thanks to Ozkan Sezer for pointing this out
This commit is contained in:
Sam Lantinga 2017-01-08 10:52:02 -08:00
parent 9d9e92cf46
commit 25b47ea381
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -18730,16 +18730,23 @@ else
fi fi
if test x$enable_libsamplerate_shared = xyes; then samplerate_lib=`find_lib "libsamplerate.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`
samplerate_lib=`find_lib "libsamplerate.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`
if test x$samplerate_lib != x; then if test x$have_loadso != xyes && \
echo "-- dynamic samplerate -> $samplerate_lib" test x$enable_libsamplerate_shared = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic libsamplerate loading" >&5
$as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic libsamplerate loading" >&2;}
fi
if test x$have_loadso = xyes && \
test x$enable_libsamplerate_shared = xyes && test x$samplerate_lib != x; then
echo "-- dynamic libsamplerate -> $samplerate_lib"
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define SDL_LIBSAMPLERATE_DYNAMIC "$samplerate_lib" #define SDL_LIBSAMPLERATE_DYNAMIC "$samplerate_lib"
_ACEOF _ACEOF
fi else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lsamplerate"
fi fi
fi fi
fi fi

18
configure.in
View File

@ -1144,12 +1144,18 @@ AC_HELP_STRING([--enable-libsamplerate], [use libsamplerate for audio rate conve
AC_HELP_STRING([--enable-libsamplerate-shared], [dynamically load libsamplerate [[default=yes]]]), AC_HELP_STRING([--enable-libsamplerate-shared], [dynamically load libsamplerate [[default=yes]]]),
, enable_libsamplerate_shared=yes) , enable_libsamplerate_shared=yes)
if test x$enable_libsamplerate_shared = xyes; then samplerate_lib=[`find_lib "libsamplerate.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`]
samplerate_lib=[`find_lib "libsamplerate.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`]
if test x$samplerate_lib != x; then if test x$have_loadso != xyes && \
echo "-- dynamic samplerate -> $samplerate_lib" test x$enable_libsamplerate_shared = xyes; then
AC_DEFINE_UNQUOTED(SDL_LIBSAMPLERATE_DYNAMIC, "$samplerate_lib", [ ]) AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic libsamplerate loading])
fi fi
if test x$have_loadso = xyes && \
test x$enable_libsamplerate_shared = xyes && test x$samplerate_lib != x; then
echo "-- dynamic libsamplerate -> $samplerate_lib"
AC_DEFINE_UNQUOTED(SDL_LIBSAMPLERATE_DYNAMIC, "$samplerate_lib", [ ])
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lsamplerate"
fi fi
fi fi
fi fi