diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-15 16:34:01 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-15 16:34:01 +0400 |
| commit | 009dea9577620d2ff0d0c95f0b4104237dea1abe (patch) | |
| tree | 7207758683cb1e79f66e2031f24a5caa2ac8677f /config | |
| parent | b8657fd64895f9fcf7d5308b298e516c02faf110 (diff) | |
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).
Diffstat (limited to 'config')
| -rw-r--r-- | config/irix6-config.py | 5 | ||||
| -rw-r--r-- | config/linux2-config.py | 5 |
2 files changed, 0 insertions, 10 deletions
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' |