summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
committerOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
commit5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch)
tree9a22b0583bb290a242df3c619665fdb692e1ecef /build.sh
parent86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff)
parent49de8add8355455da4b6ec5aaa55427fafa94322 (diff)
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index f9c6beefed..c5f74c23ee 100755
--- a/build.sh
+++ b/build.sh
@@ -59,10 +59,11 @@ pre_build()
-t $variant \
-G "$cmake_generator" \
configure \
- -DGRID:STRING="$viewer_grid" \
+ -DGRID:STRING="$viewer_grid" \
-DVIEWER_CHANNEL:STRING="$viewer_channel" \
-DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
-DINSTALL_PROPRIETARY:BOOL=ON \
+ -DRELEASE_CRASH_REPORTING:BOOL=ON \
-DLOCALIZESETUP:BOOL=ON \
-DPACKAGE:BOOL=ON \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE