From 60115821a5a25f2b8ec34fce0ed6ea8f1a2283e1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 22 Jan 2016 10:15:51 -0800 Subject: build.sh: fix logic when to build grantlee Grmbl. SUBSURFACE_EXECUTABLE now doesn't get set until later in the script. So let's just trigger this explicitly. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts/build.sh') diff --git a/scripts/build.sh b/scripts/build.sh index f171feb1e..b313cec77 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -26,7 +26,7 @@ PLATFORM=$(uname) # normally this script builds the desktop version in subsurface/build # if the first argument is "-mobile" then build Subsurface-mobile in subsurface/build-mobile # if the first argument is "-both" then build both in subsurface/build and subsurface/build-mobile -BUILD="Desktop" +BUILDGRANTLEE=0 if [ "$1" = "-mobile" ] ; then echo "building Subsurface-mobile in subsurface/build-mobile" BUILDS=( "MobileExecutable" ) @@ -36,11 +36,13 @@ elif [ "$1" = "-both" ] ; then echo "building both Subsurface and Subsurface-mobile in subsurface/build and subsurface/build-mobile, respectively" BUILDS=( "DesktopExecutable" "MobileExecutable" ) BUILDDIRS=( "build" "build-mobile" ) + BUILDGRANTLEE=1 shift else echo "building Subsurface in subsurface/build" BUILDS=( "DesktopExecutable" ) BUILDDIRS=( "build" ) + BUILDGRANTLEE=1 fi if [[ ! -d "subsurface" ]] ; then @@ -156,7 +158,7 @@ if [ $PLATFORM = Darwin ] ; then fi fi -if [ "$SUBSURFACE_EXECUTABLE" = "DesktopExecutable" ] ; then +if [ "$BUILDGRANTLEE" = "1" ] ; then # build grantlee cd $SRC -- cgit v1.2.3-70-g09d2