Commit Graph

21 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
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
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Seth ProductEngine ddbac6dbe4 EXP-1633 FIXED Updated llqtwebkit package for Linux and WebKitLibPlugin build configuration. 2012-02-28 17:21:52 +02:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Andrew de Laix 926e506d0a d'oh, forgot to add back some q libs to the build when reverting to older linux package; here they are. 2011-03-31 16:17:12 +00:00
Andrew de Laix 2f190297f0 remove lib requirement not in current llqtwebkit linux archive. 2011-03-30 20:12:37 +00:00
alain@945battery-guestA-183.lindenlab.com 616b0a2568 Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545). 2011-03-23 10:44:39 -07:00
Andrew de Laix c41d9949d7 update llqtwebkit usage. 2011-03-14 20:01:31 +00:00
Alain Linden 38a2af9235 various fixes to get the debug build working; don't look for or copy msvc*80.dll's. 2011-02-10 17:26:16 -08:00
Alain Linden cbffa57351 fix linking to llqtwebkit. 2011-02-04 12:52:36 -08:00
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Aleric Inglewood d0a25a4184 VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.
If Qt and/or llqtwebkit is found in a non-standard place, you still
have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running
the viewer of course (or the webkit plugin will silently fail).
2010-12-15 20:12:17 +01:00
Aimee Linden 29512788ad VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system version of llqtwebkit 2010-08-19 18:36:14 +01:00
Tofu Linden dbd749d533 DEV-42322 webkit plugin fails to start on linux in mercurial repo 2009-11-06 17:57:15 +00:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00