diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-26 18:34:17 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-26 18:34:17 -0400 |
commit | b931fb0c2852bf4f87ced38546b4e153075bc57e (patch) | |
tree | ee6b7bf8b1b5bf96930f88b8bed037de7b3dbc6d /build.sh | |
parent | 2a5c47eb083a55cccb60916263b3c2b5d8d9c4fe (diff) | |
parent | fad8c7edd7da7e43b0129282c790daa8b4c04ffb (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 -- \ |