From cb5db404c005e9ce982bee2a7abccad3ba043dc4 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Wed, 13 Jan 2016 00:23:27 +0000 Subject: [PATCH] CONFIGURE: Update dependency list for fluidsynth on OS X Also add missing cc_check_clean after fluid synth check. --- configure | 6 ++---- ports.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 34a839ddb81..24449d69943 100755 --- a/configure +++ b/configure @@ -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" diff --git a/ports.mk b/ports.mk index df0f3cfa413..2640a27228e 100644 --- a/ports.mk +++ b/ports.mk @@ -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