0007-forceTremor.patch 1.3 KB

123456789101112131415161718192021222324252627282930
  1. --- a/configure
  2. +++ b/configure
  3. @@ -13701,7 +13701,7 @@
  4. if test "${enable_music_ogg_tremor+set}" = set; then
  5. enableval=$enable_music_ogg_tremor;
  6. else
  7. - enable_music_ogg_tremor=no
  8. + enableval=$enable_music_ogg_tremor;
  9. fi
  10. # Check whether --enable-music-ogg-shared was given.
  11. @@ -13939,10 +13939,14 @@
  12. EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
  13. fi
  14. else
  15. - { $as_echo "$as_me:$LINENO: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&5
  16. -$as_echo "$as_me: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&2;}
  17. - { $as_echo "$as_me:$LINENO: WARNING: Ogg Vorbis support disabled" >&5
  18. -$as_echo "$as_me: WARNING: Ogg Vorbis support disabled" >&2;}
  19. + SOURCES="$SOURCES $srcdir/*_ogg.c"
  20. + EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
  21. + if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
  22. + echo "-- dynamic libvorbisidec -> $ogg_lib"
  23. + EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
  24. + else
  25. + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
  26. + fi
  27. fi
  28. else
  29. if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then