summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-05-17 21:01:36 +0000
committerDon Kjer <don@lindenlab.com>2011-05-17 21:01:36 +0000
commit0a86e39d90e06f0a690b1ff5caf2dee5fe347f8f (patch)
treec0e4f0df907c3f876dafdab3caa83e9356434fa9 /build.sh
parentae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (diff)
parent79459bc9ba8cefa67091e65dd676f50c9ddc612d (diff)
Merge with viewer-development (mesh)
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index d46da2c66d..4268c76e78 100755
--- a/build.sh
+++ b/build.sh
@@ -42,9 +42,13 @@ installer_Linux()
installer_CYGWIN()
{
- d=$(build_dir_CYGWIN ${last_built_variant:-Release})
- p=$(sed 's:.*=::' "$d/newview/${last_built_variant:-Release}/touched.bat")
- echo "$d/newview/${last_built_variant:-Release}/$p"
+ v=${last_built_variant:-Release}
+ d=$(build_dir_CYGWIN $v)
+ if [ -r "$d/newview/$v/touched.bat" ]
+ then
+ p=$(sed 's:.*=::' "$d/newview/$v/touched.bat")
+ echo "$d/newview/$v/$p"
+ fi
}
pre_build()