diff --git a/.gitignore b/.gitignore index 9a83493328..5899e73e20 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ local.properties [Rr]elease/ x64/ build/ +build_*/ [Bb]in/ [Oo]bj/ diff --git a/build.sh b/build.sh index baea40c003..8ad2585903 100755 --- a/build.sh +++ b/build.sh @@ -2,14 +2,22 @@ set -e +nonet=false; + +if [[ "$1" = "--include-nonet" ]]; then + nonet=true +fi + cachedir=.cache mkdir -p $cachedir if [[ ! -d build ]]; then mkdir -p build fi -if [[ ! -d build_nonet ]]; then - mkdir -p build_nonet +if [[ $nonet = true ]]; then + if [[ ! -d build_nonet ]]; then + mkdir -p build_nonet + fi fi libversion=2 @@ -61,10 +69,12 @@ pushd build cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .. make popd -pushd build_nonet - cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON .. - make -popd +if [[ $nonet = true ]]; then + pushd build_nonet + cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON .. + make + popd +fi if [[ ! -h openrct2.dll ]]; then ln -s build/openrct2.dll openrct2.dll