diff options
| author | Jonathan Gray | 2005-06-30 09:14:36 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-06-30 09:14:36 +0000 |
| commit | 2e273bad42819b04f45cda164766f38af3815529 (patch) | |
| tree | 23cd4704ad52a24d7c9b285ae13ec7ff91d7b122 /sound | |
| parent | f4a72b7b580ee672f31bb2e8c5a03602a36c8de3 (diff) | |
| download | scummvm-rg350-2e273bad42819b04f45cda164766f38af3815529.tar.gz scummvm-rg350-2e273bad42819b04f45cda164766f38af3815529.tar.bz2 scummvm-rg350-2e273bad42819b04f45cda164766f38af3815529.zip | |
Enhanced tremor support from Jolan Luff.
The configure script now works as follows for detection:
Tremor only: use tremor
Vorbis only: use vorbis
Both: use vorbis
This behaviour can be changed with newly added configure script options.
svn-id: r18478
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/vorbis.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 5d510173d1..0f771cb5e3 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -21,7 +21,7 @@ #include "sound/vorbis.h" -#ifdef USE_VORBIS +#if defined(USE_TREMOR) || defined(USE_VORBIS) #include "common/file.h" #include "common/util.h" @@ -29,7 +29,11 @@ #include "sound/audiostream.h" #include "sound/audiocd.h" +#ifdef USE_TREMOR +#include <tremor/ivorbisfile.h> +#else #include <vorbis/vorbisfile.h> +#endif using Common::File; |