[Scummvm-git-logs] scummvm master -> f743ae2231f3dea30eabd5b4bf09364d02dfc1aa

[criezy]

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:
f743ae2231 BUILD: Fix static scummvm build with iconv and without fluidsynth on macOS


Commit: f743ae2231f3dea30eabd5b4bf09364d02dfc1aa
    https://github.com/scummvm/scummvm/commit/f743ae2231f3dea30eabd5b4bf09364d02dfc1aa
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2019-09-14T00:03:15+01:00

Commit Message:
BUILD: Fix static scummvm build with iconv and without fluidsynth on macOS

In that configuration it was missing the -liconv flag.

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index b1a3f61..f161373 100644
--- a/ports.mk
+++ b/ports.mk
@@ -316,6 +316,10 @@ ifdef USE_FREETYPE2
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
 endif
 
+ifdef USE_ICONV
+OSX_STATIC_LIBS += -liconv
+endif
+
 ifdef USE_VORBIS
 OSX_STATIC_LIBS += \
 		$(STATICLIBPATH)/lib/libvorbisfile.a \
@@ -335,8 +339,12 @@ OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libogg.a
 endif
 
 ifdef USE_FLUIDSYNTH
+# If iconv was not yet added, add it now as we need it for libfluidsynth
+ifndef USE_ICONV
+OSX_STATIC_LIBS += -liconv
+endif
 OSX_STATIC_LIBS += \
-                -liconv -framework CoreMIDI -framework CoreAudio\
+                -framework CoreMIDI -framework CoreAudio\
                 $(STATICLIBPATH)/lib/libfluidsynth.a \
                 $(STATICLIBPATH)/lib/libglib-2.0.a \
                 $(STATICLIBPATH)/lib/libintl.a