ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1) Added warning message to configure when ogg files can't be played.

Browse Source 
2) Removed more mikmod #ifdefs.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-02-11 00:46:37 +00:00
parent 85490b5f8e
commit 3ac760d4e0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -227,6 +227,9 @@ case "${host}" in
# ov_read for ogg music needs endianness flag. This macro defines
# WORDS_BIGENDIAN if it's a big endian machine. See music_ogg.cpp
AC_C_BIGENDIAN
else
SUMMARY="$SUMMARY\nNo Ogg Vorbis support - the game will play with sound effects, but without music."
SUMMARY="$SUMMARY\nPlease install ogg vorbis!"
fi
else
SUMMARY="$SUMMARY\nInstall OpenAL and freealut for better sound!"

4
src/sfx_openal.cpp
View File

@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#if (HAVE_OPENAL && (HAVE_MIKMOD || HAVE_OGGVORBIS))
#if (HAVE_OPENAL && HAVE_OGGVORBIS)
#include <assert.h>
#include <stdio.h>
@ -116,5 +116,5 @@ bool SFXImpl::load(const char* filename)
return true;
}
#endif //if (HAVE_OPENAL && (HAVE_MIKMOD || HAVE_OGGVORBIS))
#endif //if (HAVE_OPENAL && HAVE_OGGVORBIS)

4
src/sound_plib.cpp
View File

@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//The next #if *needs* double parenthesis
#if !((HAVE_OPENAL && (HAVE_MIKMOD || HAVE_OGGVORBIS)))
#if !(HAVE_OPENAL && HAVE_OGGVORBIS)
#include <string>
@ -90,5 +90,5 @@ bool MusicPlib::resumeMusic()
return true;
}
#endif //!(HAVE_OPENAL && (HAVE_MIKMOD || HAVE_OGGVORBIS))
#endif //!(HAVE_OPENAL && HAVE_OGGVORBIS)