Commit Graph

204 Commits (eb06fba7679704a7870e3d91f2166bf7e63e5641)

Author SHA1 Message Date
Liny ec98d0d79d Merge the backout in. 2016-11-03 00:03:58 -07:00
Liny a6ad8a160f Backed out changeset: 58602af33b30 2016-11-02 23:59:00 -07:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky 6b0da7af72 Merge. 2016-01-17 01:05:13 +01:00
Nicky 69799b8277 Windows: Tweaks fo openjpeg2. 2016-01-16 14:13:10 +01:00
Nicky cbc070af09 Add option to use OpenJPEG 2.1 instead of the real old and outdated 1.4 (Windows/Linux only). 2016-01-15 16:34:23 +01:00
Nicky 35a399864d Merge. 2016-01-13 03:14:44 +01:00
Nicky 4ffd74e025 Remove leapmotion, it's outdated and unsupported. 2016-01-06 13:59:08 +01:00
Nicky c20277f2f5 Merge. 2015-12-21 20:52:46 +01: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
Ansariel 6b655eccb6 Merge LL V3.7.30 2015-06-16 00:52:24 +02:00
Tonya Souther 01a407b678 SLPlugin on OS X requires Breakpad, whether or not the viewer is built with crash reporting. 2015-05-17 18:01:11 -05:00
Nicky 512eab05cc All the little things for Linux x64 (note no working plugins as of now). 2015-05-15 18:09:11 +02:00
Nicky 8f6cdceefa Package libdb again. 2015-05-14 21:26:49 +02:00
Nicky 05a49852ed Do not copy extra pdbs, they are not present in the pkgs from LL. 2015-05-06 18:56:20 +02:00
Nicky 5e495ee954 Do not copy libdb, it's not needed. 2015-05-06 13:57:41 +02:00
Nicky 55eb540c8e Post-merge; compare with indra\cmake from LL. 2015-05-05 18:59:52 +02:00
Nicky 87eb71b987 The Windows x64 uses a static colladadom. So do not copy it. Also do not copy growl dlls for now. 2015-05-05 14:16:30 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Nicky b5c4487884 Backout 45231/6cd12cf6be5d, 45232/ad4cf15860df and 45233:f8b2e5c2690e to revert to old Linux binaries and resolve incompatibilities with some distributions. 2015-04-05 19:04:44 +02: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
Nicky 0c41d39666 Updated 3P packages for Linux x86 and Linux x64. 2015-03-30 12:39:38 +02:00
Ansariel 2ad24a02fd 100% more build success for new Growl libs 2015-03-09 19:55:58 +01:00
Nicky f4e28461e7 Remove some unused libs. 2015-02-09 23:18:07 +01:00
Ansariel 74fec467dc Backout the library updates and revert to ours for the time being so we don't block further merging up 2015-01-14 00:44:48 +01:00
Ansariel eb2f35764e Merge LL V3.7.14 2015-01-13 23:04:32 +01:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01: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
Nicky 4c9c6deda5 libllqtwebkit.dylib does not exist anymore. 2014-10-26 22:50:55 +01:00
Nicky 4a768d8e15 Proper copy target for Linux x64 libpng. 2014-08-23 00:28:46 +02:00
Nicky b4ac80203b Only copy libllqtwebkit.dylib for i386 builds. 2014-05-26 17:01:05 +02:00
Tank_Master 87bcc46ff5 Merge LL 3.7.4 2014-03-25 06:54:26 -07:00
Monty Brandenberg 460d01befb Update build plumbing with tier 2, 3 and 4 libraries 2013-11-01 23:32:44 +00:00