Commit Graph

138 Commits (8a13530ce4eeb481ee467fd3ec54f1ed7e9f632a)

Author SHA1 Message Date
Oz Linden 4181b1d9e2 correct 64bit vivox dll names 2018-01-18 12:49:54 -05:00
Oz Linden 96d28ad5a7 more places where vivox names must be conditional on address size 2018-01-18 10:15:15 -05:00
Oz Linden d7c8678c3a merge 5.1.0-release 2018-01-17 12:43:28 -05:00
Nat Goodspeed 762582c499 MAINT-7081: Mention libnghttp2*.dylib in yet another place. 2017-10-24 15:38:00 -04:00
Nat Goodspeed ee2a1902a5 MAINT-7081: Mention nghttp2.dll where it must be mentioned. 2017-09-29 08:46:44 -04:00
Nat Goodspeed 19bb6fd33e MAINT-7081: Mention nghttp2 library wherever it must be mentioned. 2017-09-27 15:27:30 -04:00
Glenn Glazer c538ff12c5 SL-700: temporarily use local version of ca-bundle.crt instead of from voice, misc cleanup 2017-06-14 14:16:23 -07:00
Callum Prentice 7005310541 Fix MAINT-7360 Investigate removal of MSVCR100.DLL and MSVCP100.DLL 2017-05-01 12:42:12 -07:00
Callum Prentice cb07ca3510 Fix for MAINT-7131 Unable to start the x64 Viewer on Windows 8.1 x64. This appears to be because two of the MS DLLs we ship with the 64 bit viewer are 32bit. Manually replacing them with their 64 bit equivalents allowed the viewer to start on Windows 8.1. The change forces the cmake file which copies the DLLs to look in C:\windows\SysWOW64 for 32 bit versions and C:\windows\system32 for 64 bit versions. (yes really). 2017-03-27 17:11:00 -07:00
Nat Goodspeed 771c7dd3c0 DRTVWR-418: Update some copy commands for 3p library versions. 2016-12-10 12:12:51 -05:00
Callum Prentice 004cd151ff update copying of fmodex{64}.dll to right place for 32/64 bit builds 2016-12-05 12:24:00 -08:00
Nat Goodspeed 6979fc5667 DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll. 2016-11-28 15:45:58 -05:00
Oz Linden 4bf583aaa2 SL-429: Use a new certificate authority bundle based on data from Mozilla 2016-07-21 17:14:07 -04:00
callum_linden 9c4ed8d113 Automated merge with tip of viewer-release to pick up 4.0.5 2016-05-19 11:00:03 -07:00
callum_linden b50df60aa1 DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewer 2016-04-21 16:13:39 -07:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden fa1913ea67 merge changes for STORM-2109 2015-06-16 14:42:31 -04:00
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
Bjoseph Wombat 239bff7182 Changes to remove zlib and vivoxplatform dlls from the windows build 2015-05-19 20:18:24 -04: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 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
Oz Linden 707e51629e update libs to match vivox distribution 2014-12-22 16:43:28 -05:00
Monty Brandenberg 29bea5a6b9 Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
Monty Brandenberg 5b542e227b All: Committing to llqtwebkit2 and the future. Updating all libraries.
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556.  Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake.  It
is the README for the building process based on things learned during
this library project.  Switch building process back to style used for
new llqtwebkit2 repo.  This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building.  All have comparable FPS rates.  Builds are
getting quieter.  Forward, comrades!
2014-06-03 19:37:58 -04:00
Monty Brandenberg 403ec62e3c All: Update library SDL to 290309, c-ares to 290089, boost to 290191,
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255,
google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157,
llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083,
pcre to 290150, zlib to 290080.  The freetype2 headers are now normalized
to what they would normally be on a unix-type system.  Libxml2 and
pcre are available on all platforms.  Libraries generally move in the
direction of static archives rather than shared libraries (e.g. openssl).
The llqtwebkit side is a step back from the more ambitious goal.  What
will be used (290262) will be a simple rebuild of the existing 4.7.1
library with updated package dependencies.  The bigger work will be in
the future.
2014-05-28 19:40:45 +00:00
Oz Linden d00d37d23b merge changes for OPEN-199 2014-04-22 16:03:35 -04:00
Monty Brandenberg 04404b68b5 All/Mac: Update libraries to new template builds. Package for static libz/libpng/openssl.
Update library dependencies to reference builds using new templates and
modern build hosts for:  SDL, c-ares, boost, curl, libpng, llqtwebkit2,
openssl and zlib.  Update manifest, library copying and 'test_apps' setup
to reflect that zlib and openssl are now always static (on Mac and
Linux).  Viewer and test_apps now functional on 10.7 Mac.
2014-04-14 17:59:00 -04:00
Monty Brandenberg e72d546fe3 Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
Part of the switchover to dynamic Qt4.  This mostly completes the
Mac side.  Webkit is functional on Mac, plugins work.  The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac).  Also
need to address libz.dylib vs libz.a.  Currently resolving against
dylib which is not what I want.
2014-04-11 19:19:22 -04:00
Monty Brandenberg 30eb6d13f5 Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest for
openssl on Mac (copy, deploy).  Revert Linux manifest work which tried
to work around 0555 permissions on .sos (and didn't work).
2014-04-07 14:01:34 -04:00
Monty Brandenberg 469438707d Library updates and switch to 3d-llqtwebkit2 build products.
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0
with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8,
openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit
built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2
repository.

Windows is functional with a good number of warning messages
at runtime from libpng and KDU.  MoaP/slplugin functioning.
2014-04-04 16:30:50 -04:00
Monty Brandenberg d7481cd07c Merge. Refresh from viewer-release after 3.7.4 release. 2014-04-03 18:56:46 -04:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Monty Brandenberg c62d2cca29 Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries
and it had a bad library reference on Linux for release.  In
llaudio land, the audio engine interfaces, even the fmodex
specializations, seem to want to be external-structure free
so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION
and deal with it in the ctor/dtor.
2014-03-14 20:58:35 -04:00
Monty Brandenberg 460d01befb Update build plumbing with tier 2, 3 and 4 libraries 2013-11-01 23:32:44 +00:00
simon 71e2efab16 Merge downstream code - Vivox release 2013-08-05 14:50:40 -07:00
Aura Linden ce9962b338 Merged in viewer-release 2013-07-11 17:49:13 -07:00
Aura Linden c96b8281a9 Thanks mercurial. 2013-05-15 20:56:51 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Oz Linden 545e033d1e merge changes for DRTVWR-299 2013-05-07 15:11:55 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
callum_linden 88eff41649 Merge with viewer-development 2013-04-17 13:38:04 -07:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham Linden) 903996e8d4 Google Breakpad Fix 2013-03-28 19:25:51 -07:00
Graham Madarasz e08de2f609 Fix linux_crash_logger freetype fail (now finds prebuilts as it should) 2013-03-12 07:27:31 -07:00
Nat Goodspeed 54e2d2b000 MAINT-2389: Change viewer to Boost package without ucontext.h.
In autobuild.xml, specify today's build of the Boost package that includes the
Boost.Context library, and whose boost::dcoroutines library uses Boost.Context
exclusively instead of its previous context-switching underpinnings (source of
the ucontext.h dependency).
Add BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it
with the viewer and with the lllogin.cpp test executable.
Track new Boost package convention that our (early, unofficial) Boost.Coroutine
library is now accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc.
Remove #include <boost/coroutine/coroutine.hpp> from
llviewerprecompiledheaders.h and lllogin.cpp: old rule that Boost.Coroutine
header must be #included before anything else that might use ucontext.h is
gone now that we no longer depend on ucontext.h. In fact remove
-D_XOPEN_SOURCE in 00-Common.cmake because that was inserted specifically to
work around a known problem with the ucontext.h facilities.
2013-02-21 01:13:24 -05:00
Aura Linden 669d1295a3 Added ca-bundle.crt behaviors for Mac and Windows. 2013-02-15 17:05:01 -08:00
Graham Madarasz (Graham) efa7022c3a Nix trying to copy the debug fmod DLL 2013-02-04 15:10:39 -08:00