More convenience.

This commit is contained in:
Faerbit 2014-11-24 19:54:13 +01:00
parent 8cccd9fc8c
commit 3f28b0d2e2
2 changed files with 10 additions and 8 deletions

View File

@ -23,7 +23,7 @@ threads=$(($(nproc)+1))
cd extern/bullet/
mkdir -p build
cd build
if [[ $2 == "ninja" ]]
if hash ninja 2>/dev/null
then
$cmake -DBUILD_DEMOS=0 -DBUILD_EXTRAS=0 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -GNinja ..
ninja
@ -38,7 +38,7 @@ cd $currentDir
mkdir -p build
cd build
if [[ $2 == "ninja" ]]
if hash ninja 2>/dev/null
then
$cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -GNinja ..
ninja

View File

@ -12,15 +12,17 @@ then
platform="windows"
fi
#./build.sh clean
if hash ninja 2>/dev/null
binaries=$(ls binaries)
if [[ $binaries == *.exe && $platform == linux ]]
then
./build.sh $platform ninja
else
./build.sh $platform
./build.sh clean
elif [[ $binaries != *.exe && $platform == windows ]]
then
./build.sh clean
fi
./build.sh $platform
rc=$?
if [[ $rc == 0 ]]