Commit Graph

812 Commits (94ac0064354594de8adbb99084029c8b4027b2f6)

Author SHA1 Message Date
maksymsproductengine f0fa1961a8 MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo LLTextBase::normalizeUri() issue: windows build fix 2014-09-24 04:20:36 +03:00
Savchenko Maksym 454a4a2905 MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo LLTextBase::normalizeUri() issue 2014-09-24 03:36:00 +03:00
maksymsproductengine 61e05f9125 MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser; 2014-09-22 20:01:55 +03:00
Monty Brandenberg 29bea5a6b9 Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
Monty Brandenberg 903729d5c9 Merge. Refresh from viewer-release after 3.7.9 release. 2014-06-16 16:41:52 -04:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Monty Brandenberg 2ccbef39a6 All: Update openssl to 1.0.1h/290662, curl to 290664, llqtwebkit to 290663.
Linux:  Include libQtXml and libQtSvg in manifest for libqsvg.so.
More documentation thoughts for library package structure.
2014-06-05 18:37:24 -04:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07: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 98ecd04436 Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.
Release and Debug builds working.  Remove the DOM_DYNAMIC define so
that we don't create declspec declarations to colladadom objects
and pull in libxml2_a (_a for archive) to complete the link.  Debug
functional and would be moreso if not for all the CrtCheckMemory()
calls.
2014-05-28 19:10:26 -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
Monty Brandenberg 060c728970 Merge. Pull in viewer-release after release of 3.7.8 2014-05-22 22:08:54 +00:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Oz Linden 9353868d91 merge changes for STORM-1831 2014-04-23 11:53:05 -04:00
Oz Linden 5870788f68 catch a few more cases of STANDALONE -> USESYSTEMLIBS 2014-04-22 16:08:13 -04:00
Oz Linden d00d37d23b merge changes for OPEN-199 2014-04-22 16:03:35 -04:00
Monty Brandenberg f8874d04b8 Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes to find newest code.
Windows autobuild package had a bad checksum due to oddities in the build
system.  On Linux I've been fighting with getting libz 1.2.8 and libpng
1.6.8 to be the definitive version in the viewer.  Problem is the *massive*
library search tree we assemble.  We find older shared library versions
first and so those dominated.  By using --whole-archive with static libraries,
the packaged versions of these libraries are made definitive.
2014-04-15 22:48:52 +00: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 6631dc22f0 All/Linux: Update llqtwebkit to latest all-shared lib build. Linux package
assembly updated to deal with Qt libraries and discrete codec and imageformat
plugins (which live under bin/llplugin).  Functioning Linux viewer with MoaP
support with a few image problems (sRGB profile, zlib errors).  Much of this
expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.
2014-04-09 21:05:55 +00:00
Brad Payne (Vir Linden) ea7f34d37a merge 2014-04-08 13:20:23 -04:00
Oz Linden 375c05ac43 merge changes for 3.7.5-release 2014-04-08 11:41:12 -04:00
Richard Linden 98aabdc176 merge with release 2014-04-07 19:09:40 -07: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 1422f89612 Linux: Finish new Boost dependencies to get Linux building again. 2014-04-04 21:59:15 +00: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
Brad Payne (Vir Linden) d10ecef615 merge 2014-03-31 11:59:11 -04:00
Richard Linden e5bbdafded merge with release 2014-03-24 19:23:34 -07:00
simon 991636d57b Merge in viewer-release and version update to 3.7.6 2014-04-07 14:26:15 -07:00
Monty Brandenberg d0a41a1716 OPEN-210 FMOD Ex include confusion. Revert FMODEX.cmake
change from changeset 3d662c2f1aad.  This gave the TPVDs some
grief and was an unfinished attempt at cleanup.
2014-04-01 13:33:32 -04:00
Aura Linden 77ec712b15 Merged in viewer-release. 2014-03-24 11:30:17 -07: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 4f565ed077 Update fmodex to 4.44.31. Move DSP descriptor to heap storage. 2014-03-14 19:48:35 -04:00
Richard Linden 516061275b fixed unit tests being generated as Windows GUI projects instead of console projects 2014-01-09 12:18:34 -08:00
Aura Linden 6809348125 Creating a cleaner branch 2013-12-03 17:06:06 -08:00
Oz Linden 7f39d0472e merge changes for STORM-1831 2013-11-18 13:51:24 -05:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Monty Brandenberg 460d01befb Update build plumbing with tier 2, 3 and 4 libraries 2013-11-01 23:32:44 +00:00
Don Kjer 7866356d77 Merge viewer-release => sunshine-internal 2013-10-29 13:20:18 +00:00
Ima Mechanique 4027486dbb storm-1831 Incorporating Oz's changes to update libxml on linux to libxml2 2013-10-18 17:38:31 +01:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
Brad Payne (Vir Linden) e6a68e1f09 merge 2013-09-10 15:30:13 -04:00