Branch sync

This commit is contained in:
mfeemster
2015-07-31 19:50:13 -07:00
parent fda1fdeee7
commit 6b702334b9
2 changed files with 32 additions and 4 deletions

View File

@ -5,7 +5,6 @@ NVIDIA=''
NATIVE=''
CONCURRENCY='-j9'
QMAKE=${QMAKE:-qmake}
RELEASE='CONFIG+=release CONFIG-=debug'
while test $# -gt 0
do
@ -18,8 +17,6 @@ do
;;
--travis) CONCURRENCY="-j1"
;;
--debug) RELEASE="CONFIG+=debug CONFIG-=release"
;;
--*) echo "bad option $1"; exit 1
;;
*) echo "unrecognised argument $1"; exit 1
@ -36,7 +33,7 @@ do
if [ "x1" = "x$REBUILD" ]; then
make clean
fi
$QMAKE "$NVIDIA" "$NATIVE" $RELEASE
$QMAKE "$NVIDIA" "$NATIVE"
make $CONCURRENCY
if [ "x$?" != "x0" ]; then
echo "Build failed! Check output for errors."