From f743ae2231f3dea30eabd5b4bf09364d02dfc1aa Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 14 Sep 2019 00:03:15 +0100 Subject: BUILD: Fix static scummvm build with iconv and without fluidsynth on macOS In that configuration it was missing the -liconv flag. --- ports.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ports.mk b/ports.mk index b1a3f61919..f161373cb0 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 -- cgit v1.2.3