diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-05-02 13:31:54 -0700 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-05-02 13:31:54 -0700 |
| commit | 9930e22ac5a16aff16bf334c92a3505322b2936e (patch) | |
| tree | 3a97fdea92dce8c9d70c310fb67d7d0713909bfe /build.sh | |
| parent | 49745fe4edad24c0fc4f9428829a974b273db979 (diff) | |
| parent | cdbad842c276efda32b36aba1040e3205f0fc38c (diff) | |
Automated merge with head of 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 -- \ |