mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-02-01 18:40:12 -05:00
Merge branch 'master' of https://github.com/mfeemster/fractorium.git
This commit is contained in:
commit
34568b297b
@ -5,6 +5,7 @@ NVIDIA=''
|
||||
NATIVE=''
|
||||
CONCURRENCY='-j9'
|
||||
QMAKE=${QMAKE:-qmake}
|
||||
RELEASE='CONFIG+=release CONFIG-=debug'
|
||||
|
||||
while test $# -gt 0
|
||||
do
|
||||
@ -17,6 +18,8 @@ do
|
||||
;;
|
||||
--travis) CONCURRENCY="-j1"
|
||||
;;
|
||||
--debug) RELEASE="CONFIG+=debug CONFIG-=release"
|
||||
;;
|
||||
--*) echo "bad option $1"; exit 1
|
||||
;;
|
||||
*) echo "unrecognised argument $1"; exit 1
|
||||
@ -33,7 +36,7 @@ do
|
||||
if [ "x1" = "x$REBUILD" ]; then
|
||||
make clean
|
||||
fi
|
||||
$QMAKE "$NVIDIA" "$NATIVE"
|
||||
$QMAKE "$NVIDIA" "$NATIVE" $RELEASE
|
||||
make $CONCURRENCY
|
||||
if [ "x$?" != "x0" ]; then
|
||||
echo "Build failed! Check output for errors."
|
||||
|
Loading…
Reference in New Issue
Block a user