diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-14 09:40:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-14 09:40:20 -0400 |
| commit | 04f3304bfb6cd04cb4784eccaac080e57b2ae6fb (patch) | |
| tree | f498e509a2c2cb0e8898f43d31ba458a8640b36f /build.sh | |
| parent | d7f5122ee9e12b5aec14b15517c3a4c0021544ce (diff) | |
| parent | 038c555fc4254de62a477d1c83a2131970b0b2b5 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -97,14 +97,14 @@ pre_build() # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build. RELEASE_CRASH_REPORTING=ON + HAVOK=ON SIGNING=() if [ "$arch" == "Darwin" ] - then HAVOK=OFF + then if [ "$variant" == "Release" ] then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") fi - else HAVOK=ON fi "$autobuild" configure --quiet -c $variant -- \ |