diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-02-15 22:32:10 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-02-15 22:32:10 -0800 |
| commit | 299cdaab70cff2bbf7a709cb53d5f097c50f05fc (patch) | |
| tree | 2e49b05b93fe141d7ca980da0b8f208a576227e4 /8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch | |
| parent | Rebuild with fixed depends (diff) | |
| download | scummvm-299cdaab70cff2bbf7a709cb53d5f097c50f05fc.tar.xz | |
Updated to 2.1.1
Diffstat (limited to '8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch')
| -rw-r--r-- | 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch b/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch new file mode 100644 index 0000000..47f53c5 --- /dev/null +++ b/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch @@ -0,0 +1,25 @@ +commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 +Author: D G Turner <digitall@scummvm.org> +Date: Sun Dec 15 22:22:20 2019 +0000 + + AUDIO: Fix Compilation Against Fluidsynth v2.1+ + + This is as reported by eriktorbjorn. + +diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp +index 4034b2ffc3..33a74a1524 100644 +--- a/audio/softsynth/fluidsynth.cpp ++++ b/audio/softsynth/fluidsynth.cpp +@@ -35,7 +35,12 @@ + #include "backends/platform/ios7/ios7_common.h" + #endif + ++// Fluidsynth v2.1+ uses printf in one of it's headers, so this is ++// needed to allow compilation, as reported by eriktorbjorn on 20191215 ++// This is in include/fluidsynth/log.h around line 82 ++#define FORBIDDEN_SYMBOL_EXCEPTION_printf + #include <fluidsynth.h> ++#undef FORBIDDEN_SYMBOL_EXCEPTION_printf + + class MidiDriver_FluidSynth : public MidiDriver_Emulated { + private: |