CONFIGURE: Update dependency list for fluidsynth on OS X

Also add missing cc_check_clean after fluid synth check.
This commit is contained in:
Thierry Crozat 2016-01-13 00:23:27 +00:00
parent 14057f3dc7
commit cb5db404c0
2 changed files with 3 additions and 5 deletions

6
configure vendored
View file

@ -3906,10 +3906,7 @@ case $_host_os in
;;
darwin*)
# TODO: Check actual requirements for static FluidSynth and
# dependencies linking. This is currently based on iOS dependencies
# which might be different due to less features enabled for iOS.
FLUIDSYNTH_STATIC_LIBS="$FLUIDSYNTH_LIBS -framework Foundation -framework CoreMIDI -lglib-2.0 -lintl -liconv"
FLUIDSYNTH_STATIC_LIBS="$FLUIDSYNTH_LIBS -framework Foundation -framework CoreMIDI -framework CoreAudio -lglib-2.0 -lintl -liconv -lreadline"
;;
iphone)
@ -3932,6 +3929,7 @@ EOF
FLUIDSYNTH_LIBS="$FLUIDSYNTH_STATIC_LIBS"
cc_check_no_clean $FLUIDSYNTH_CFLAGS $FLUIDSYNTH_LIBS && _fluidsynth=yes
fi
cc_check_clean
fi
if test "$_fluidsynth" = yes; then
append_var LIBS "$FLUIDSYNTH_LIBS"

View file

@ -247,7 +247,7 @@ endif
ifdef USE_FLUIDSYNTH
OSX_STATIC_LIBS += \
-liconv -framework CoreMIDI \
-liconv -lreadline -framework CoreMIDI -framework CoreAudio\
$(STATICLIBPATH)/lib/libfluidsynth.a \
$(STATICLIBPATH)/lib/libglib-2.0.a \
$(STATICLIBPATH)/lib/libintl.a