[Scummvm-cvs-logs] CVS: scummvm/sound vorbis.cpp,1.30.2.2,1.30.2.3

Joost Peters joostp at users.sourceforge.net
Fri Jan 27 14:43:01 CET 2006


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1286/sound

Modified Files:
      Tag: branch-0-8-0
	vorbis.cpp 
Log Message:
libTremor on PSP now installs to the proper location, so we no longer need this #ifdef.
I thought I had already changed this on trunk before the 0-8-0 branch, but apparently not..


Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -d -r1.30.2.2 -r1.30.2.3
--- vorbis.cpp	18 Jan 2006 18:07:37 -0000	1.30.2.2
+++ vorbis.cpp	27 Jan 2006 22:42:36 -0000	1.30.2.3
@@ -30,11 +30,7 @@
 #include "sound/audiocd.h"
 
 #ifdef USE_TREMOR
-#ifdef __PSP__
-#include <ivorbisfile.h>
-#else
 #include <tremor/ivorbisfile.h>
-#endif
 #else
 #include <vorbis/vorbisfile.h>
 #endif





More information about the Scummvm-git-logs mailing list