Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2018-07-29 18:33:39 +02:00
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -1071,10 +1071,11 @@ if test x$enable_sidplay != xno && test x$found_sidplayfp = xno; then
fi
if test x$enable_sidplay = xyes; then
SIDPLAY_LIBS="$SIDPLAY_LIBS -lresid-builder"
AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplayfp or libsidplay2 support])
if test x$found_sidplayfp = xyes; then
AC_DEFINE(HAVE_SIDPLAYFP, 1, [Define if libsidplayfp is used instead of libsidplay2])
else
SIDPLAY_LIBS="$SIDPLAY_LIBS -lresid-builder"
fi
fi