Commit Graph

114 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
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
Graham Madarasz (Graham) 60448cac91 More path fixups in staging 2013-02-04 12:06:17 -08:00
Sovereign Engineer 3ea6112843 Dos2Unix Line endings 2013-02-04 08:30:42 -05:00
Graham Madarasz (Graham) 3822600e27 Added copy of libfmodex .so for linux 2013-02-01 09:33:57 -08:00
callum_linden b0f2f02333 Removed (most) references to older FMOD library - still a little Linux clean up left 2013-02-01 08:44:52 -08:00
callum_linden ba3e89b5c7 first push - patch from CmdCupCake plus force FMODEX on 2013-01-18 16:43:19 -08:00
Don Kjer 531394df23 Updating linux libGLOD to match darwin naming 2012-12-12 00:34:40 +00:00
Nat Goodspeed 3581bba282 Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake. 2012-11-16 15:39:58 -05:00
Monty Brandenberg fdb2ae8335 Merge of viewer-development (3.4.1). 2012-08-03 11:57:51 -04:00
Oz Linden 2c3e78f1f1 merge changes for DRTVWR-167 2012-06-27 14:18:22 -04:00
Monty Brandenberg 2f496ecaee Add more boost libs to the lib copy and manifest. 2012-05-09 06:49:18 -07:00
Monty Brandenberg e1a978bbcf And more boost library work. 2012-05-08 13:39:06 -07:00
Monty Brandenberg c5be6d0b92 Okay, needed full version numbers. 2012-05-08 13:15:42 -07:00
Monty Brandenberg b7d3ae7dce More linux work. Think I found the stager. 2012-05-08 12:17:37 -07:00
Oz Linden 9b64464d02 more attempts to fix the hunspell lib for Mac 2012-04-25 12:27:34 -04:00
Oz Linden 7bcfd3a4ae fix version number of the libhunspell dylib in another place 2012-04-23 17:27:54 -04:00
Brad Payne (Vir Linden) 16b6595fa7 trying to fix linux build error 2012-01-26 13:38:11 -05:00
Brad Payne (Vir Linden) e0f9197110 Fix for build failures when tcmalloc disabled 2012-01-25 14:58:47 -05:00
Kitty Barnett 9c66ac87fd STORM-276 Basic spellchecking framework 2012-01-20 18:06:32 +01:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Dave Parks 62208046ae merge 2011-04-21 16:37:03 -05:00
Dave Parks 19857d0cf0 merge 2011-04-21 16:23:00 -05:00
Ima Mechanique 4906f4644f OPEN-61 Adding locations that redistributable package installs msvc* files. 2011-04-21 22:11:48 +01:00