diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 17:16:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 17:16:12 -0400 |
| commit | a4467e9ffe9dc378451d7bb6b8c70f6c0c42a814 (patch) | |
| tree | c6a918a0a3a0d7e1117ca71bfc966e3d6cd4b5ea /build.sh | |
| parent | 1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (diff) | |
| parent | 07ec10781e45b3d92e27e92ddad39cf74fa7ff0b (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
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 -- \ |