faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

More convenience.

Browse Source
This commit is contained in:
Faerbit 2014-11-24 19:54:13 +01:00
parent 2bf6eb667c
commit 78de14907a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

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

14
package.sh
View File

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