aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThierry Crozat2017-10-02 20:55:51 +0100
committerThierry Crozat2017-10-02 20:55:51 +0100
commitade8aadd3c291b7b33e8004ca168b70dfbe325cb (patch)
treed664b2da1edea1d04d3f98d4993f4c414da8840a /configure
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 'configure')
-rwxr-xr-xconfigure10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure
index 98cc9879bc..6938bec2a6 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)
#