diff options
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | ports.mk | 8 |
2 files changed, 10 insertions, 8 deletions
@@ -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) # @@ -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\ |