Skip to content

M
mpd
Commit 2da5b7cb authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Merge branch 'v0.20.x'

parents 1e88e71b b1e073ba
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
configure.ac
View file @ 2da5b7cb
...@@ -1071,10 +1071,11 @@ if test x$enable_sidplay != xno && test x$found_sidplayfp = xno; then ...@@ -1071,10 +1071,11 @@ if test x$enable_sidplay != xno && test x$found_sidplayfp = xno; then
fi fi
if test x$enable_sidplay = xyes; then if test x$enable_sidplay = xyes; then
SIDPLAY_LIBS="$SIDPLAY_LIBS -lresid-builder"
AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplayfp or libsidplay2 support]) AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplayfp or libsidplay2 support])
if test x$found_sidplayfp = xyes; then if test x$found_sidplayfp = xyes; then
AC_DEFINE(HAVE_SIDPLAYFP, 1, [Define if libsidplayfp is used instead of libsidplay2]) AC_DEFINE(HAVE_SIDPLAYFP, 1, [Define if libsidplayfp is used instead of libsidplay2])
else
SIDPLAY_LIBS="$SIDPLAY_LIBS -lresid-builder"
fi fi
fi fi
......
python/build/libs.py
View file @ 2da5b7cb
...@@ -112,8 +112,8 @@ liblame = AutotoolsProject( ...@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
) )
ffmpeg = FfmpegProject( ffmpeg = FfmpegProject(
'http://ffmpeg.org/releases/ffmpeg-4.0.1.tar.xz', 'http://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz',
'605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee', 'a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97',
'lib/libavcodec.a', 'lib/libavcodec.a',
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment