From 1eff2e12357cfd1abf9379276aa769d8aa0c0876 Mon Sep 17 00:00:00 2001 From: begasus Date: Sat, 22 Jun 2019 08:26:38 +0200 Subject: Fix gcc2 build diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e1a61b..fd25c2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,7 +188,7 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_C endif ( NOT APPLE AND NOT OS2 ) # define some warning flags - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -Werror=implicit-function-declaration" ) + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes" ) # prepend to build type specific flags, to allow users to override set ( CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" ) diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c index f27d7eb..17a31d1 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c @@ -209,6 +209,7 @@ void fluid_synth_settings(fluid_settings_t *settings) fluid_settings_register_str(settings, "midi.portname", "", 0); #ifdef __HAIKU__ + { char midiSettings[PATH_MAX] = ""; if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) { strcat(midiSettings, "/Media/midi_settings"); @@ -223,6 +224,7 @@ void fluid_synth_settings(fluid_settings_t *settings) } } } + } #else #ifdef DEFAULT_SOUNDFONT fluid_settings_register_str(settings, "synth.default-soundfont", DEFAULT_SOUNDFONT, 0); -- 2.24.0