zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-21 02:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added dynamic loading of FluidSynth 2.x

Browse source 
# Conflicts:
#	src/sound/mididevices/music_fluidsynth_mididevice.cpp
This commit is contained in:
alexey.lysiuk 2019-10-13 10:09:51 +03:00 committed by drfrag
parent af566f2d52
commit d5451fd281
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sound/mididevices/music_fluidsynth_mididevice.cpp
View file

@ -134,8 +134,10 @@ extern "C" unsigned __stdcall GetSystemDirectoryA(char *lpBuffer, unsigned uSize
#ifdef __APPLE__
#define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib"
#define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib"
#else // !__APPLE__
#define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
#define FLUIDSYNTHLIB2 "libfluidsynth.so.2"
#endif // __APPLE__
#endif
@ -790,19 +792,12 @@ bool FluidSynthMIDIDevice::LoadFluidSynth()
return true;
}
#ifdef FLUIDSYNTHLIB2
if(!FluidSynthModule.Load({FLUIDSYNTHLIB1, FLUIDSYNTHLIB2}))
{
Printf(TEXTCOLOR_RED "Could not load " FLUIDSYNTHLIB1 " or " FLUIDSYNTHLIB2 "\n");
return false;
}
#else
if(!FluidSynthModule.Load({fluid_lib, FLUIDSYNTHLIB1}))
{
Printf(TEXTCOLOR_RED "Could not load " FLUIDSYNTHLIB1 ": %s\n", dlerror());
return false;
}
#endif
return true;
}