From 4378124f3f117855027f8d2b23ccd2b23314f12c Mon Sep 17 00:00:00 2001 From: Gunter Labes Date: Sat, 29 Mar 2008 01:12:29 +0000 Subject: [PATCH] turn library checks off in scons... ...and add some more options for a less noise compilation --- utils/mp-server/update_server | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/mp-server/update_server b/utils/mp-server/update_server index 772cd8c9eb7..d07cc34c791 100755 --- a/utils/mp-server/update_server +++ b/utils/mp-server/update_server @@ -20,7 +20,9 @@ if ! [ -d $SOURCE ]; then echo "$SOURCE not found." exit 1 fi - +# only really needed on server.wesnoth.org +CXXFLAGS="$CXXFLAGS -I$HOME/tools/include" +LDFLAGS="$LDFLAGS -L$HOME/tools/lib" case $SERVER in 1.2 ) cd $SOURCE/1.2 || exit 1 CXXFLAGS="$CXXFLAGS -ggdb3" @@ -54,12 +56,13 @@ mkdir -p $BUILD/$DIR if [ "$SCONS" == "yes" ]; then mkdir -p $BUILD/$DIR/var/run - CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS scons install-wesnothd prefix=$BUILD/$DIR fifodir=$BUILD/$DIR/var/run raw_sockets=1 profile=1 fribidi=0 python=0 + CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS scons install-wesnothd prefix=$BUILD/$DIR fifodir=$BUILD/$DIR/var/run raw_sockets=1 profile=1 fribidi=0 python=0 prereqs=0 localedir= prefsdir= | tee $BUILD/$DIR/scons.log || exit 1 + echo "adding '$SERVER' suffix..." mv $BUILD/$DIR/bin/wesnothd $BUILD/$DIR/bin/wesnothd-$SERVER else echo 'autogen.sh and configure...' ./autogen.sh > $BUILD/$DIR/autogen.log - ./configure --prefix=$BUILD/$DIR --program-suffix=-$SERVER --enable-server --enable-raw-sockets --disable-game --with-fifodir=$BUILD/$DIR/var/run --disable-nls --enable-lite --enable-profile --with-boost=$HOME/tools > $BUILD/$DIR/configure.log CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS + ./configure --prefix=$BUILD/$DIR --program-suffix=-$SERVER --enable-server --enable-raw-sockets --disable-game --with-fifodir=$BUILD/$DIR/var/run --disable-nls --enable-lite --enable-profile --with-boost=$HOME/tools > $BUILD/$DIR/configure.log CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS || exit 1 make clean > /dev/null echo 'make...'