27 lines
969 B
Diff
27 lines
969 B
Diff
From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001
|
|
From: D G Turner <digitall@scummvm.org>
|
|
Date: Sun, 15 Dec 2019 22:22:20 +0000
|
|
Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+
|
|
|
|
This is as reported by eriktorbjorn.
|
|
---
|
|
audio/softsynth/fluidsynth.cpp | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
|
|
index 4034b2ffc36..33a74a15247 100644
|
|
--- audio/softsynth/fluidsynth.cpp
|
|
+++ 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:
|