decoder/modplug: assume ModPlug is built as static library on Windows

2020-05-27 14:29:24 +02:00 · 2020-05-27 14:29:24 +02:00 · 4e5d6e560b
parent d276d8eda2
commit 4e5d6e560b
2 changed files with 7 additions and 1 deletions
--- a/1
+++ b/1
@ -4,6 +4,7 @@ ver 0.21.24 (not yet released)
 * database
  - simple: fix crash when mounting twice
 * decoder
+  - modplug: fix Windows build failure
  - wildmidi: attempt to detect WildMidi using pkg-config
  - wildmidi: fix Windows build failure
 * Android
--- a/src/decoder/plugins/ModplugDecoderPlugin.cxx
+++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx
@ -26,8 +26,13 @@
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"

-#include <libmodplug/modplug.h>
+#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 <assert.h>