aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Crozat2016-01-13 00:23:27 +0000
committerThierry Crozat2016-01-13 00:24:11 +0000
commitcb5db404c005e9ce982bee2a7abccad3ba043dc4 (patch)
treeb0c8d186f6f5074b1213f64d6366e16f42d7a658
parent14057f3dc76de7425216b820da8b30a837a07f40 (diff)
downloadscummvm-rg350-cb5db404c005e9ce982bee2a7abccad3ba043dc4.tar.gz
scummvm-rg350-cb5db404c005e9ce982bee2a7abccad3ba043dc4.tar.bz2
scummvm-rg350-cb5db404c005e9ce982bee2a7abccad3ba043dc4.zip
CONFIGURE: Update dependency list for fluidsynth on OS X
Also add missing cc_check_clean after fluid synth check.
-rwxr-xr-xconfigure6
-rw-r--r--ports.mk2
2 files changed, 3 insertions, 5 deletions
diff --git a/configure b/configure
index 34a839ddb8..24449d6994 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 df0f3cfa41..2640a27228 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