From 009dea9577620d2ff0d0c95f0b4104237dea1abe Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 15 May 2009 12:34:01 +0000 Subject: Bug/patch #18714: fix game engine sound on OS X Intel, patch by Ken Hursh and myself. * Get rid of dependency on ALUT. It is really only used to load a WAV file, and apparently crashing doing so on OS X Intel, (perhaps due to endian issues?). There was already own code for doing this on some system, so now it uses that. That code had it's own endian issues which are now fixed, along with better checks to avoid crashing on corrupt or unsupported files. * Also get rid of some unecessarily complicate #ifdefs. * According to the bug report OS X Intel OpenAL only works with static openal linking still (WITH_BF_STATICOPENAL for scons). --- config/irix6-config.py | 5 ----- config/linux2-config.py | 5 ----- 2 files changed, 10 deletions(-) (limited to 'config') diff --git a/config/irix6-config.py b/config/irix6-config.py index 2c57a2bba8a..e4c989952cf 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -24,11 +24,6 @@ BF_OPENAL_LIB = 'openal' BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' BF_OPENAL_LIBPATH = LIBDIR + '/lib' -# some distros have a separate libalut -# if you get linker complaints, you need to uncomment the line below -# BF_OPENAL_LIB = 'openal alut' -# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a' - BF_CXX = '/usr' WITH_BF_STATICCXX = 'false' BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' diff --git a/config/linux2-config.py b/config/linux2-config.py index 6d207dc40e6..b0ff0b89d3d 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -28,11 +28,6 @@ BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal' BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -# some distros have a separate libalut -# if you get linker complaints, you need to uncomment the line below -# BF_OPENAL_LIB = 'openal alut' -# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a' - BF_CXX = '/usr' WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -- cgit v1.2.3