aboutsummaryrefslogtreecommitdiff
path: root/ports.mk
diff options
context:
space:
mode:
authorThierry Crozat2017-10-02 20:55:51 +0100
committerThierry Crozat2017-10-02 20:55:51 +0100
commitade8aadd3c291b7b33e8004ca168b70dfbe325cb (patch)
treed664b2da1edea1d04d3f98d4993f4c414da8840a /ports.mk
parent5a11f90ccd8b4329807ff6d91523a9650803fa91 (diff)
downloadscummvm-rg350-ade8aadd3c291b7b33e8004ca168b70dfbe325cb.tar.gz
scummvm-rg350-ade8aadd3c291b7b33e8004ca168b70dfbe325cb.tar.bz2
scummvm-rg350-ade8aadd3c291b7b33e8004ca168b70dfbe325cb.zip
CONFIGURE: Add ogg after libraries that might depend on it in the link command
This will hopefully fix compilation with mingw when using static libraries.
Diffstat (limited to 'ports.mk')
-rw-r--r--ports.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/ports.mk b/ports.mk
index 617b4e995f..3fbc2d9a1a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -302,10 +302,6 @@ ifdef USE_FREETYPE2
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
endif
-ifdef USE_OGG
-OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libogg.a
-endif
-
ifdef USE_VORBIS
OSX_STATIC_LIBS += \
$(STATICLIBPATH)/lib/libvorbisfile.a \
@@ -320,6 +316,10 @@ ifdef USE_FLAC
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libFLAC.a
endif
+ifdef USE_OGG
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libogg.a
+endif
+
ifdef USE_FLUIDSYNTH
OSX_STATIC_LIBS += \
-liconv -framework CoreMIDI -framework CoreAudio\