thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Add ogg after libraries that might depend on it in the link command

Browse source 
This will hopefully fix compilation with mingw when using static libraries.
This commit is contained in:
Thierry Crozat 2017-10-02 20:55:51 +01:00
parent 5a11f90ccd
commit ade8aadd3c
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure vendored
View file

@ -3921,10 +3921,6 @@ int main(void) { return 0; }
EOF EOF
cc_check $OGG_CFLAGS $OGG_LIBS -logg && _ogg=yes cc_check $OGG_CFLAGS $OGG_LIBS -logg && _ogg=yes
fi 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' define_in_config_if_yes "$_ogg" 'USE_OGG'
echo "$_ogg" echo "$_ogg"
@ -4026,6 +4022,12 @@ fi
define_in_config_if_yes "$_flac" 'USE_FLAC' define_in_config_if_yes "$_flac" 'USE_FLAC'
echo "$_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) # Check for MAD (MP3 library)
# #

8
ports.mk
View file

@ -302,10 +302,6 @@ ifdef USE_FREETYPE2
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
endif endif
ifdef USE_OGG
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libogg.a
endif
ifdef USE_VORBIS ifdef USE_VORBIS
OSX_STATIC_LIBS += \ OSX_STATIC_LIBS += \
$(STATICLIBPATH)/lib/libvorbisfile.a \ $(STATICLIBPATH)/lib/libvorbisfile.a \
@ -320,6 +316,10 @@ ifdef USE_FLAC
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libFLAC.a OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libFLAC.a
endif endif
ifdef USE_OGG
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libogg.a
endif
ifdef USE_FLUIDSYNTH ifdef USE_FLUIDSYNTH
OSX_STATIC_LIBS += \ OSX_STATIC_LIBS += \
-liconv -framework CoreMIDI -framework CoreAudio\ -liconv -framework CoreMIDI -framework CoreAudio\