diff --git a/src/i_oalmusic.c b/src/i_oalmusic.c index a9d538f5..fa1c6466 100644 --- a/src/i_oalmusic.c +++ b/src/i_oalmusic.c @@ -439,7 +439,11 @@ static boolean I_OAL_InitMusic(int device) return false; } -static int fl_gain, opl_gain; +#if defined(HAVE_FLUIDSYNTH) +static int fl_gain; +#endif + +static int opl_gain; static void I_OAL_SetMusicVolume(int volume) { @@ -609,7 +613,7 @@ static const char **I_OAL_DeviceList(void) static midiplayertype_t I_OAL_MidiPlayerType(void) { -#ifdef HAVE_FLUIDSYNTH +#if defined (HAVE_FLUIDSYNTH) if (active_module == &stream_fl_module) { return midiplayer_fluidsynth; diff --git a/src/mn_setup.c b/src/mn_setup.c index 1eb8d7b6..346b01b6 100644 --- a/src/mn_setup.c +++ b/src/mn_setup.c @@ -2492,6 +2492,7 @@ static void SetMidiPlayerOpl(void) } } +#if defined(HAVE_FLUIDSYNTH) static void SetMidiPlayerFluidSynth(void) { if (I_MidiPlayerType() == midiplayer_fluidsynth) @@ -2499,6 +2500,7 @@ static void SetMidiPlayerFluidSynth(void) SetMidiPlayer(); } } +#endif static void RestartMusic(void) { @@ -2653,7 +2655,10 @@ static setup_menu_t music_settings1[] = { static void UpdateGainItems(void) { +#if defined (HAVE_FLUIDSYNTH) DisableItem(auto_gain, music_settings1, "fl_gain"); +#endif + DisableItem(auto_gain, music_settings1, "opl_gain"); }