aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qtopia/scummvm/scummvm-0.6.0/tremor.patch
blob: 3acf302ec8c162451b0b882c8b22c8c08e6bfd00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- ./sound/vorbis.cpp.old	2004-05-16 04:23:59.000000000 +0930
+++ ./sound/vorbis.cpp	2004-05-16 04:24:23.000000000 +0930
@@ -29,7 +29,7 @@
 #include "sound/audiostream.h"
 #include "sound/audiocd.h"
 
-#include <vorbis/vorbisfile.h>
+#include <tremor/ivorbisfile.h>
 
 
 AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
--- ./configure.old	2004-05-16 04:46:47.000000000 +0930
+++ ./configure	2004-05-16 04:50:42.000000000 +0930
@@ -560,15 +560,15 @@
 if test "$_vorbis" = auto ; then
   _vorbis=no
   cat > $TMPC << EOF
-#include <vorbis/codec.h>
+#include <tremor/ivorbiscodec.h>
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
   cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
-  -lvorbis -logg -lm && _vorbis=yes
+  -lvorbisidec -logg -lm && _vorbis=yes
 fi
 if test "$_vorbis" = yes ; then
   _def_vorbis='#define USE_VORBIS'
-  LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
+  LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisidec -logg"
   INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
 else
   _def_vorbis='#undef USE_VORBIS'