chocolate-doom/buildscripts
0
0
Fork 0
mirror of https://github.com/chocolate-doom/buildscripts.git synced 2024-11-10 06:31:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build on recent versions of Mac OS X: Adding -lobjc fixes the SDL

Browse source 
autoconf checks. Use SDL_net 1.2.8 rather than 1.2.6 and fix Chocolate
Doom Sourceforge download link.

Subversion-branch: /buildscripts
Subversion-revision: 2548
This commit is contained in:
Simon Howard 2012-12-22 23:32:19 +00:00
parent f48d71516b
commit 1803a518c2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build-chocolate-doom
View file

@ -338,6 +338,7 @@ if [ `uname` = "Darwin" ]; then
SDL_BUILD_OPTIONS="--disable-video-x11 $SDL_BUILD_OPTIONS" SDL_BUILD_OPTIONS="--disable-video-x11 $SDL_BUILD_OPTIONS"
CC="gcc -m32" CC="gcc -m32"
export CC export CC
LDFLAGS="-lobjc $LDFLAGS"
else else
LDFLAGS="-Wl,-rpath -Wl,$INSTALL_DIR/lib $LDFLAGS" LDFLAGS="-Wl,-rpath -Wl,$INSTALL_DIR/lib $LDFLAGS"
fi fi
@ -381,7 +382,7 @@ if $force_build_sdl || ! have_header SDL_net.h; then
# SDL_net not installed; we must build it # SDL_net not installed; we must build it
fetch_and_build_module http://www.libsdl.org/projects/SDL_net/release/ \ fetch_and_build_module http://www.libsdl.org/projects/SDL_net/release/ \
SDL_net 1.2.6 "$HOST_ARG" SDL_net 1.2.8 "$HOST_ARG"
fi fi
if $force_build_sdl || ! have_header SDL_mixer.h; then if $force_build_sdl || ! have_header SDL_mixer.h; then
@ -418,7 +419,7 @@ if $svn_build; then
else else
# Build v1.7.0 # Build v1.7.0
fetch_and_build_module http://downloads.sourceforge.net/project/chocolate-doom/chocolate-doom/1.7.0/ \ fetch_and_build_module http://ignum.dl.sourceforge.net/project/chocolate-doom/chocolate-doom/1.7.0/ \
chocolate-doom 1.7.0 "$HOST_ARG" chocolate-doom 1.7.0 "$HOST_ARG"
fi fi