mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1830 from Gymnasiast/update-gitignore

Browse Source 
Add build_nonet to .gitignore
This commit is contained in:
Ted John
2015-08-20 20:27:32 +01:00
parent 32a46e699d 903fba2747
commit 415fac21e3
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -64,6 +64,7 @@ local.properties
[Rr]elease/
x64/
build/
build_*/
[Bb]in/
[Oo]bj/

22
build.sh
View File

@@ -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