Merge branch 'v0.21.x'

2020-05-27 16:16:30 +02:00
parent c5f80dc543 30d97fe8a0
commit 5e93e882c9
12 changed files with 128 additions and 12 deletions
--- a/src/decoder/plugins/ModplugDecoderPlugin.cxx
+++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx
@@ -27,6 +27,12 @@
 #include "util/StringView.hxx"
 #include "Log.hxx"

+#ifdef _WIN32
+/* assume ModPlug is built as static library on Windows; without
+   this, linking to the static library would fail */
+#define MODPLUG_STATIC
+#endif
+
 #include <libmodplug/modplug.h>

 #include <cassert>