summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-02-21 17:12:27 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-02-21 17:12:27 -0500
commit038c555fc4254de62a477d1c83a2131970b0b2b5 (patch)
tree7ff52992aca2f118c5d0040acd510ca411eb1155 /build.sh
parent0ecb32bafb3f0082ddce07b16b51bba29a9cb3c4 (diff)
DRTVWR-418: In viewer64-mac-havok fork, turn on Xcode 8 Havok.
This is known not to work yet: the relevant Havok libraries are not being bundled with llphysicsextensions, therefore the viewer can't link with any Havok symbols.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index 9ca130b5d5..a8f4158bff 100755
--- a/build.sh
+++ b/build.sh
@@ -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 -- \