Build using SDL_mixer 1.2.11 on every platform.

Subversion-branch: /buildscripts
Subversion-revision: 2168
This commit is contained in:
Simon Howard 2010-11-26 17:49:42 +00:00
parent 2c7fc92732
commit ae9db5b3a4

View file

@ -263,14 +263,8 @@ SDL_BUILD_OPTIONS=""
if [ `uname` = "Darwin" ]; then
SDL_BUILD_OPTIONS="--disable-video-x11 $SDL_BUILD_OPTIONS"
# MacOS needs the latest version of SDL_mixer: older versions have
# compile problems
SDL_MIXER_VERSION=1.2.11
else
LDFLAGS="-Wl,-rpath -Wl,$INSTALL_DIR/lib $LDFLAGS"
SDL_MIXER_VERSION=1.2.6
fi
SDL_CFLAGS=
@ -299,7 +293,7 @@ if ! check_header SDL_mixer.h; then
# SDL_mixer not installed; we must build it
fetch_and_build_module http://www.libsdl.org/projects/SDL_mixer/release/ SDL_mixer $SDL_MIXER_VERSION ""
fetch_and_build_module http://www.libsdl.org/projects/SDL_mixer/release/ SDL_mixer 1.2.11 ""
fi
# Build Chocolate Doom. We can build the stable version or check out