livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm

master
Nicky 2020-07-24 00:22:26 +02:00
parent 39a972e36d d80df3cdb7
commit cbfed2c092
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README_BUILD_FIRESTORM_WINDOWS.txt
View File

@ -2,10 +2,10 @@ Before you start configuring your Windows build system, be aware of our tested c
Memory: You will need at least 2GB RAM, 4GB strongly recommended.
CPU: Multiple CPUs are strongly recommended.
A build can take over an hour.
Visual Studio 2013 Community Edition.
Visual Studio 2017 Community Edition.
Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help
compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may
compiling Firestorm, make sure you can build the Second Life viewer first. If you try and skip this step, you may
receive much less help. http://wiki.secondlife.com/wiki/Visual_Studio_2013_Viewer_Builds
If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself.
@ -48,7 +48,7 @@ If you want to build the 64bit version, add the parameter -A 64 to the autobuild
Logs:
Look for logs in build-vc120-32/logs for 32bit builds and build-vc120-64/logs for 64bit
Look for logs in build-vc150-32/logs for 32bit builds and build-vc150-64/logs for 64bit
Output:
Look for output in build-vc120-32/newview/Release for 32bit builds and build-vc120-64/newview/Release for 64bit
Look for output in build-vc150-32/newview/Release for 32bit builds and build-vc150-64/newview/Release for 64bit

8
scripts/configure_firestorm.sh
View File

@ -332,7 +332,7 @@ then
if [ -z "${AUTOBUILD_VSVER}" ]
then
echo "AUTOBUILD_VSVER not set, this can lead to Autobuild picking a higher VS version than desired."
echo "If you see this happen you should set the variable to e.g. 120 for Visual Studio 2013."
echo "If you see this happen you should set the variable to e.g. 150 for Visual Studio 2017."
fi
fi
@ -377,8 +377,8 @@ if [ \( $WANTS_CLEAN -eq $TRUE \) -a \( $WANTS_BUILD -eq $FALSE \) ] ; then
fi
elif [ $PLATFORM == "windows" ] ; then
rm -rf build-vc${AUTOBUILD_VSVER:-120}-${AUTOBUILD_ADDRSIZE}
mkdir -p build-vc${AUTOBUILD_VSVER:-120}-${AUTOBUILD_ADDRSIZE}/logs
rm -rf build-vc${AUTOBUILD_VSVER:-150}-${AUTOBUILD_ADDRSIZE}
mkdir -p build-vc${AUTOBUILD_VSVER:-150}-${AUTOBUILD_ADDRSIZE}/logs
elif [ $PLATFORM == "linux" ] ; then
if [ "${AUTOBUILD_ADDRSIZE}" == "64" ]
@ -551,7 +551,7 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
elif [ $PLATFORM == "windows" ] ; then
msbuild.exe Firestorm.sln /p:Configuration=${BTYPE} /flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \
/flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" /p:Platform=${AUTOBUILD_WIN_VSPLATFORM} /t:Build /p:useenv=true \
/verbosity:normal /toolsversion:12.0 /p:"VCBuildAdditionalOptions= /incremental"
/verbosity:normal /toolsversion:15.0 /p:"VCBuildAdditionalOptions= /incremental"
fi
fi