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

Added support for ninja build system and fixed uploading to Mega.

Browse Source
This commit is contained in:
Faerbit 2014-11-24 15:59:59 +01:00
parent 8a96be1275
commit 8cccd9fc8c
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.sh
View File

@ -23,8 +23,14 @@ threads=$(($(nproc)+1))
cd extern/bullet/
mkdir -p build
cd build
$cmake -DBUILD_DEMOS=0 -DBUILD_EXTRAS=0 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 ..
make -j$threads
if [[ $2 == "ninja" ]]
then
$cmake -DBUILD_DEMOS=0 -DBUILD_EXTRAS=0 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -GNinja ..
ninja
else
$cmake -DBUILD_DEMOS=0 -DBUILD_EXTRAS=0 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 ..
make -j$threads
fi
cd $currentDir
@ -32,5 +38,11 @@ cd $currentDir
mkdir -p build
cd build
$cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 ..
make -j$threads
if [[ $2 == "ninja" ]]
then
$cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -GNinja ..
ninja
else
$cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 ..
make -j$threads
fi

11
package.sh
View File

@ -12,9 +12,14 @@ then
platform="windows"
fi
./build.sh clean
#./build.sh clean
./build.sh $platform
if hash ninja 2>/dev/null
then
./build.sh $platform ninja
else
./build.sh $platform
fi
rc=$?
@ -26,7 +31,7 @@ then
zip -r "MarbleGame_${platform^}.zip" "MarbleGame_${platform^}"
if hash megacmd 2>/dev/null
then
megacmd put "MarbleGame_${platform^}.zip" mega:/GameBuilds/
megacmd -force put "MarbleGame_${platform^}.zip" mega:/GameBuilds/
fi
rm -rf "MarbleGame_${platform^}"
fi