Commit Graph

870 Commits (712a4e70c81c1908e4e7668ff1695a9415ec4b71)

Author SHA1 Message Date
AndreyL ProductEngine c76e983b03 MAINT-2577 Fixed the status message 2015-06-12 11:37:17 +03:00
AndreyL ProductEngine fd45c728b2 MAINT-5277 FIXED Viewer is missing MSVCP100.DLL and MSVCR100.DLL 2015-06-12 11:11:38 +03:00
Cinder 56a7c4af97 BUG-8786 - Turn off fast math opts enforcing IEEE 754 floating point compliance 2015-03-24 12:17:07 -06:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05:00
Nat Goodspeed 198046e21d Include MSVCP120.DLL and MSVCR120.DLL in Windows viewer package.
Generalize Copy3rdPartyLibs.cmake to eliminate some clone-and-tweak redundancy.
2015-01-27 15:34:43 -05:00
Nat Goodspeed 6d7858c53a Automated merge with http://bitbucket.org/lindenlab/viewer-tools-update 2015-01-21 10:30:25 -05:00
Nat Goodspeed b349bcf2b6 Merge fix for copying Linux Vivox files 2015-01-21 08:29:21 -05:00
Nat Goodspeed 93fe221208 Backed out changeset 1e36e0629994 copying .dylibs on Linux
The .dylib files in the Linux Vivox package were erroneous to start with;
while the affected changeset bypassed copy errors, it too was wrong. Now that
the Linux Vivox package contains Linux .so files, revert to the correct
filenames to copy.
2015-01-21 08:28:33 -05:00
Nat Goodspeed c157db954a Automated merge with http://bitbucket.org/lindenlab/viewer-tools-update 2015-01-19 08:41:30 -05:00
callum_linden 85b5036285 Add flags to inject extra debugging information (via Sovreign Engineer) 2015-01-16 01:08:48 +00:00
Nat Goodspeed 355d006851 Rationalize use of AUTOBUILD environment variable across languages.
Ensure that AUTOBUILD is always in native path syntax on every platform.
Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh
has set it properly, or scream for help.
Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a
local 'autobuild' variable using shell_path.
Remove kludges in other languages involving cygdrive twiddling.
2015-01-08 16:48:29 -05:00
Nat Goodspeed 27951fa1d4 First cut at consuming new slplugins autobuild package.
The contents are extracted, but not yet built into the viewer installer.
2015-01-07 19:45:51 -05:00
Oz Linden 707e51629e update libs to match vivox distribution 2014-12-22 16:43:28 -05:00
Oz Linden e5771553c1 merge latest trunk changes 2014-12-22 08:26:47 -05:00
Nat Goodspeed f6abe4a228 Merge backout of forcing DEBUG_PREBUILT setting. 2014-12-19 16:47:06 -05:00
Nat Goodspeed 77edde1752 Backed out changeset 4356b6a222c7: forcing DEBUG_PREBUILT output.
It appears that our trouble was due to a cygwin-style path in the AUTOBUILD
environment variable, and that changeset 0e0bd8b546ad fixed it.
2014-12-19 16:42:26 -05:00
Nat Goodspeed 35d141967a Defend against cygwin-style AUTOBUILD path in environment. 2014-12-19 15:58:20 -05:00
Nat Goodspeed b9be170403 Force DEBUG_PREBUILT on in Prebuilt.cmake to debug failures on TC. 2014-12-19 15:16:13 -05:00
Oz Linden e7fca4af50 merge latest changes for windows 2014-12-18 09:48:44 -05:00
Oz Linden 7b2045e734 allow signed vs unsigned compare in gcc 2014-12-18 09:47:27 -05:00
callum_linden df5006eac9 Update autobuild to point to new version of jsoncpp and change lib names to match those in package 2014-12-17 19:29:30 -08:00
callum_linden b265b899d4 Update autobuild to point to new (VS2013) Havok files and fix up name mismatch 2014-12-17 16:24:31 -08:00
Oz Linden ca6736807e include Prebuilt.cmake before using macro 2014-12-17 17:57:17 -05:00
Oz Linden 2385cac566 Move the cmake package tracking files under the packages directory 2014-12-17 16:57:48 -05:00
Oz Linden 4666497507 merge up to latest changes from callum and nat 2014-12-17 14:28:58 -05:00
Oz Linden 2714ecea21 adjust cmake not to attempt loads of packages on the wrong platforms 2014-12-17 13:13:41 -05:00
Oz Linden f8ed44f8ec merge latest updates from nat and callum 2014-12-17 11:15:31 -05:00
Nat Goodspeed 0d71baba74 Produce error message, not traceback, when test program doesn't build.
A traceback from a Python script always makes people think there's a bug in
your script. Even when a test program fails to build, CMake often (always?)
tries to run it anyway, via our run_build_test.py script. For that case,
produce a straightforward error message -- rather than an OSError traceback
that doesn't even mention the program name!
2014-12-17 11:10:33 -05:00
callum_linden 71c70117dd Add feature (enabled) to turn off media plugins 2014-12-15 10:10:18 -08:00
Oz Linden 11ab03331f include quicktime package only on windows 2014-12-15 13:02:12 -05:00
Oz Linden 37cd872f40 include libuuid and fontconfig only on linux 2014-12-15 13:00:47 -05:00
Oz Linden 062c13364b don't include glext on Mac where it is not used 2014-12-15 12:57:56 -05:00
Nat Goodspeed f7d1ece5be Make JsonCpp.cmake reference Windows lib names we actually use. 2014-12-12 17:33:24 -05:00
Nat Goodspeed c56036a8cb Add /SAFESEH:NO /NODEFAULTLIB:LIBCMT to viewer linker switches.
zlib cannot be linked with SAFESEH, which is the VS 2013 default, so every
consumer must set /SAFESEH:NO.
/NODEFAULTLIB:LIBCMT seems to eliminate many duplicate-symbol link errors.
2014-12-11 12:13:07 -05:00
Nat Goodspeed cbb6a416fc Make havok_source package name agree with name from repo URL.
Until we get a havok-source package built with new metadata-bearing autobuild,
the package name in autobuild.xml and CMake must agree with the tarball
filename.
2014-12-04 21:48:13 -05:00
Oz Linden 680194deaf automate keeping the About SL -> Licenses tab correct 2014-11-21 18:09:12 -05:00
Nat Goodspeed 6be2f0ba2b Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2014-11-14 08:49:08 -05:00
simon fa7610fea5 Merge downstream code and become 3.7.20 2014-11-03 17:54:24 -08:00
Oz Linden a959ede776 correct test construction macro target reference for integration tests 2014-10-21 17:56:13 -04:00
callum_linden 5bef95e86d Update to build on Xcode 6.0: remove final, unwanted warning 2014-10-21 10:08:38 -07:00
callum_linden 5234730779 Update to build on Xcode 6.0: Remove concept of XCODE_VERSION from CMake files - we standardize on Xcode 6 2014-10-20 15:04:45 -07:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
callum_linden c853b470db Update to build on Xcode 6.0: WTH! how did this ever link? 2014-10-20 11:41:35 -07:00
callum_linden aca7976b87 Update to build on Xcode 6.0: turn BACK ON warnings as errors for overloaded virtuals [-Woverloaded-virtual] and fix up first (of many) files 2014-10-17 13:05:04 -07:00
callum_linden 5ab3a832d3 Update to build on Xcode 6.0: turn OFF warnings as errors for overloaded virtuals [-Wno-overloaded-virtual] 2014-10-17 12:35:26 -07:00
callum_linden 01125b2826 Update to build on Xcode 6.0: change name of prebuilt binary to match new format in autobuild.xml (subnname-subname vs subname_subname) 2014-10-17 12:00:13 -07:00
callum_linden 512b166d54 Update to build on Xcode 6.0: first pass at CMake changes to get a build started 2014-10-17 11:44:45 -07:00
JJ Linden 5cb5c267ca fixes for cmake warnings about policy changes. could not fully test these changes 2014-10-13 12:46:55 -07:00
callum_linden 4fb1bae807 update autobuild.xml to point to new versions of boost, googlemock and colladadom 2014-10-10 14:49:48 -07:00
callum_linden c519fd3314 Updates to point to lots of new third party libs and some small tweaks to take account of minor name changes 2014-10-07 17:35:39 -07:00