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

[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:
ade8aadd3c CONFIGURE: Add ogg after libraries that might depend on it in the link command


Commit: ade8aadd3c291b7b33e8004ca168b70dfbe325cb
    https://github.com/scummvm/scummvm/commit/ade8aadd3c291b7b33e8004ca168b70dfbe325cb
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-10-02T20:55:51+01:00

Commit Message:
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.

Changed paths:
    configure
    ports.mk


diff --git a/configure b/configure
index 98cc987..6938bec 100755
--- a/configure
+++ b/configure
@@ -3921,10 +3921,6 @@ int main(void) { return 0; }
 EOF
 	cc_check $OGG_CFLAGS $OGG_LIBS -logg && _ogg=yes
 fi
-if test "$_ogg" = yes ; then
-	append_var LIBS "$OGG_LIBS -logg"
-	append_var INCLUDES "$OGG_CFLAGS"
-fi
 define_in_config_if_yes "$_ogg" 'USE_OGG'
 echo "$_ogg"
 
@@ -4026,6 +4022,12 @@ fi
 define_in_config_if_yes "$_flac" 'USE_FLAC'
 echo "$_flac"
 
+# Add the link to ogg only after verbs tremor and flac as it might be used by those.
+if test "$_ogg" = yes ; then
+	append_var LIBS "$OGG_LIBS -logg"
+	append_var INCLUDES "$OGG_CFLAGS"
+fi
+
 #
 # Check for MAD (MP3 library)
 #
diff --git a/ports.mk b/ports.mk
index 617b4e9..3fbc2d9 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\