[patch] fix

ustunts-fix.diff (text/plain), 2.06 KB, created by Matheus Izvekov on 2006-05-14 11:32:10 UTC

Only in b: autom4te.cache
diff -ur a/configure.ac b/configure.ac
--- a/configure.ac	2005-12-21 14:37:12.000000000 -0200
+++ b/configure.ac	2006-05-14 15:08:52.000000000 -0300
@@ -129,7 +129,14 @@
 AC_CHECK_HEADER(AL/al.h, AC_DEFINE(OPENAL_HEADER))
 AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal $soundlibs";AC_DEFINE(HAVE_LIBOPENAL))
 
-if test "x$soundlibs" = "x" ; then
+dnl ------------------------
+dnl Check alut audio library (currently default)
+dnl ------------------------
+AC_CHECK_HEADER(AL/alut.h, AC_DEFINE(ALUT_HEADER))
+AC_CHECK_LIB(alut, alutGetError, soundlibs="-lalut $soundlibs";AC_DEFINE(HAVE_LIBALUT))
+
+
+if test "$soundlibs" != "-lalut -lopenal " ; then
 
   dnl ------------------------
   dnl Check fmod audio library (if openal not present)
Only in b: stamp-h1
diff -ur a/ultimatestunts/sndsample.cpp b/ultimatestunts/sndsample.cpp
--- a/ultimatestunts/sndsample.cpp	2005-05-20 11:04:26.000000000 -0300
+++ b/ultimatestunts/sndsample.cpp	2006-05-14 14:35:16.000000000 -0300
@@ -98,8 +98,8 @@
 	ALsizei
 		format = AL_FORMAT_MONO16,
 		size = 0,
-		bits = 0,
 		freq = 44100;
+	ALboolean bits = 0;
 
 	CString extension = realfile.mid(realfile.length() - 4);
 	extension.toLower();
@@ -108,7 +108,7 @@
 	{
 		//the loading proc
 		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
-			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) VORBISFUNC);
+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);
 
 		if(alutLoadVorbis == NULL)
 		{
@@ -134,7 +134,7 @@
 	{
 		//the loading proc
 		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
-			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) MP3FUNC);
+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);
 
 		if(alutLoadMP3 == NULL)
 		{
@@ -159,7 +159,7 @@
 	else //default: load as wave file
 	{
 		alGenBuffers(1, &m_Buffer);
-		alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);
+		alutLoadWAVFile((ALbyte *) realfile.c_str(), &format, &wave, &size, &freq, &bits);
 		alBufferData(m_Buffer, format, wave, size, freq);
 	}