[Scummvm-cvs-logs] scummvm master -> eccb55570e3ed27276573b23093ffedcf3e794cc

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eccb55570e BUILD: Fix statically compiling with libfluidsynth on Mac OS X


Commit: eccb55570e3ed27276573b23093ffedcf3e794cc
    https://github.com/scummvm/scummvm/commit/eccb55570e3ed27276573b23093ffedcf3e794cc
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-08-19T17:41:34-07:00

Commit Message:
BUILD: Fix statically compiling with libfluidsynth on Mac OS X

Changed paths:
    configure
    ports.mk



diff --git a/configure b/configure
index d4fec02..211d9e6 100755
--- a/configure
+++ b/configure
@@ -3363,7 +3363,7 @@ if test "$_fluidsynth" = yes ; then
 	esac
 	INCLUDES="$INCLUDES $FLUIDSYNTH_CFLAGS"
 fi
-define_in_config_h_if_yes "$_fluidsynth" 'USE_FLUIDSYNTH'
+define_in_config_if_yes "$_fluidsynth" 'USE_FLUIDSYNTH'
 echo "$_fluidsynth"
 
 #
diff --git a/ports.mk b/ports.mk
index 9a20331..ed6781a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -96,6 +96,12 @@ ifdef USE_FLAC
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libFLAC.a
 endif
 
+ifdef USE_FLUIDSYNTH
+OSX_STATIC_LIBS += \
+                -framework CoreAudio \
+                $(STATICLIBPATH)/lib/libfluidsynth.a
+endif
+
 ifdef USE_MAD
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libmad.a
 endif