30 lines
790 B
Diff
30 lines
790 B
Diff
--- audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000
|
|
+++ audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000
|
|
@@ -20,10 +20,16 @@
|
|
*
|
|
*/
|
|
|
|
-#include "common/scummsys.h"
|
|
+#include "config.h"
|
|
|
|
#ifdef USE_FLUIDSYNTH
|
|
|
|
+// Fluidsynth v2.1+ uses printf in one of it's headers,
|
|
+// include/fluidsynth/log.h around line 82 so need to include this
|
|
+// prior scummsys.h inclusion and thus forbidden.h
|
|
+#include <fluidsynth.h>
|
|
+
|
|
+#include "common/scummsys.h"
|
|
#include "common/config-manager.h"
|
|
#include "common/error.h"
|
|
#include "common/system.h"
|
|
@@ -35,8 +41,6 @@
|
|
#include "backends/platform/ios7/ios7_common.h"
|
|
#endif
|
|
|
|
-#include <fluidsynth.h>
|
|
-
|
|
class MidiDriver_FluidSynth : public MidiDriver_Emulated {
|
|
private:
|
|
MidiChannel_MPU401 _midiChannels[16];
|