diff options
| author | Thierry Crozat | 2019-09-14 00:03:15 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2019-09-14 00:03:15 +0100 |
| commit | f743ae2231f3dea30eabd5b4bf09364d02dfc1aa (patch) | |
| tree | 0b3a33e9b5c60aa2eb19bc3e7f5699cec4779863 /ports.mk | |
| parent | 7f05cba9f163962ef1de23945e2a0fc7737c83a8 (diff) | |
| download | scummvm-rg350-f743ae2231f3dea30eabd5b4bf09364d02dfc1aa.tar.gz scummvm-rg350-f743ae2231f3dea30eabd5b4bf09364d02dfc1aa.tar.bz2 scummvm-rg350-f743ae2231f3dea30eabd5b4bf09364d02dfc1aa.zip | |
BUILD: Fix static scummvm build with iconv and without fluidsynth on macOS
In that configuration it was missing the -liconv flag.
Diffstat (limited to 'ports.mk')
| -rw-r--r-- | ports.mk | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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 |