chocolate-doom
/
buildscripts
mirror of https://github.com/chocolate-doom/buildscripts.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't pass --with-sdl-prefix for every module. 

Some non-SDL libraries won't like this arg.
This commit is contained in:
Simon Howard 2016-12-29 18:59:53 +01:00
parent 31796ab296
commit 35a28545a8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-chocolate-doom
View File

@ -170,7 +170,7 @@ build_module() {
echo Building module...
cd "$BUILD_DIR/$module"
(./configure --with-sdl-prefix=$SDL_PREFIX --prefix=$INSTALL_DIR $args) || exit
(./configure --prefix=$INSTALL_DIR $args) || exit
make || exit
# Install the package
@ -453,14 +453,16 @@ if $force_build_sdl || ! have_header SDL_net.h; then
# SDL_net not installed; we must build it
fetch_and_build_module http://www.libsdl.org/projects/SDL_net/release/ \
SDL_net 1.2.7 "$HOST_ARG"
SDL_net 1.2.7 \
"--with-sdl-prefix=$SDL_PREFIX $HOST_ARG"
fi
if $force_build_sdl || ! have_header SDL_mixer.h; then
# SDL_mixer not installed; we must build it
# Disable dependencies on external libraries for sound file formats:
mixer_opts="--disable-music-mod --disable-music-mp3 \
mixer_opts="--with-sdl-prefix=$SDL_PREFIX $HOST_ARG \
--disable-music-mod --disable-music-mp3 \
--disable-music-flac-shared --disable-music-ogg-shared"
# ...except ones we're building.