From e45dab156bc5fdf67f6d9b78bd0a9b178c22599a Mon Sep 17 00:00:00 2001 From: Arrehn Date: Tue, 1 Mar 2011 12:13:36 -0800 Subject: [PATCH] Linux build now defaults to openAL instead of FMOD. Patch from Mysty Saunders --- build_firestorm_linux.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build_firestorm_linux.sh b/build_firestorm_linux.sh index c828854f4b..a44bfbbcc4 100755 --- a/build_firestorm_linux.sh +++ b/build_firestorm_linux.sh @@ -17,6 +17,7 @@ WANTS_CONFIG=$FALSE WANTS_BUILD=$FALSE WANTS_PACKAGE=$FALSE WANTS_VERSION=$FALSE +WANTS_FMOD=$FALSE BTYPE="Release" CHANNEL="private-`hostname`" @@ -38,12 +39,13 @@ showUsage() echo " --rebuild : Build, reusing unchanged projects to save time" echo " --chan [Release|Beta|Private] : Private is the default, sets channel" echo " --btype [Release|RelWithDebInfo] : Release is default, whether to use symbols" + echo " --fmod : Build with fmod" } getArgs() # $* = the options passed in from main { - while getoptex "clean config version rebuild help chan: btype:" "$@" ; do + while getoptex "clean config version fmod rebuild help chan: btype:" "$@" ; do case "$OPTOPT" in clean) WANTS_CLEAN=$TRUE;; @@ -54,6 +56,7 @@ getArgs() WANTS_PACKAGE=$TRUE;; chan) CHANNEL="$OPTARG";; btype) BTYPE="$OPTARG";; + fmod) WANTS_FMOD=$TRUE;; help) showUsage && exit 0;; @@ -229,8 +232,13 @@ if [ $WANTS_VERSION -eq $TRUE ] ; then fi if [ $WANTS_CONFIG -eq $TRUE ] ; then + if [ $WANTS_FMOD -eq $TRUE ] ; then + FMOD="-DFMOD:BOOL=ON" + else + FMOD="-DFMOD:BOOL=OFF" + fi mkdir -p ../logs > /dev/null 2>&1 - ./develop.py -t $BTYPE configure -DFIRECYG:BOOL=ON -DPACKAGE:BOOL=ON -DLL_TESTS:BOOL=OFF -DVIEWER_CHANNEL:STRING=Firestorm-$CHANNEL -DVIEWER_LOGIN_CHANNEL:STRING=Firestorm-$CHANNEL 2>&1 | tee $LOG + ./develop.py -t $BTYPE configure $FMOD -DFIRECYG:BOOL=ON -DPACKAGE:BOOL=ON -DLL_TESTS:BOOL=OFF -DVIEWER_CHANNEL:STRING=Firestorm-$CHANNEL -DVIEWER_LOGIN_CHANNEL:STRING=Firestorm-$CHANNEL 2>&1 | tee $LOG fi