Commit Graph

3449 Commits (master)

Author SHA1 Message Date
Tank_Master c8867f50bf update linux webkit to 4.7.1 (package from phoenix) 2011-09-07 13:42:51 -07:00
callum e20f94a297 Point to new Mac version of LLQtWebKit to fix symbol export issue on that platform 2011-08-31 09:27:13 -07:00
callum 8277471f98 Silly URL typo 2011-08-29 17:55:09 -07:00
callum 6ab8c2a1e8 EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content debugger to help content creators
Viewer side changes to enable Web debugger.
2011-08-29 17:13:29 -07:00
Arrehn 897fc2d9f1 Initial attempt to prepare libhunspell infrastructure 2011-08-30 02:26:37 -04:00
Arrehn c802ea2279 ReleaseFS autobuild target improvements. No package by default, better --btype parsing 2011-08-27 23:25:13 -04:00
Arrehn 8d9fba43b9 Firestorm merge catchup 2011-08-27 06:00:46 -04:00
Arrehn 8de8a5f1cf Merge with RLVa 2.8, part 1
Known issues:
- RLV Debug method commented out
- RLV Windlight options not implemented
2011-08-27 01:21:37 -04:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn 04ca03ba00 Additional RelWithDebInfoFS_open safety 2011-08-19 22:21:55 -04:00
Arrehn 5f80dbef9e FS Autobuild improvements: support for RelWithDebInfoFS_open, LL-style config options, more documentation 2011-08-19 20:48:34 -04:00
Arrehn 0cd25c177d Updated KDU linux package 2011-08-17 23:54:03 -04:00
Arrehn 4f283f4e18 Fix line endings in autobuild.xml 2011-08-15 10:58:02 -04:00
Kadah_Coba abcc9eab32 Replaced old "secondlife-bin" refs in autobuild.xml to "firestorm-bin"
This should allow the linden-only configs to work for FS devs now
2011-08-13 21:28:54 -07:00
Arrehn 5fa1965925 Change default behavior of ReleaseFS_open target to package by default 2011-08-11 21:04:09 -04:00
Arrehn 8f4e60995c Changed verbosity of the ReleaseFS_open build to less chatter, request by Wolfpup 2011-08-08 21:50:46 -04:00
Arrehn b3bb1c25f8 Moved vivox packages from /opt/firestorm to phoenixviewer.com 2011-08-08 21:39:26 -04:00
autobuild.xml c5d1d541a1 Adjusted KDU autobuild package, removed fmod from ReleaseFS_open 2011-08-08 07:01:44 -04:00
Arrehn 2676fe01d3 Adding in "ReleaseFS_open' autobuild target for non-kdu builds. Documentation & cleaning fixes. 2011-08-06 08:36:02 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Richard Linden 88a90aabcb Automated merge with http://hg.secondlife.com/viewer-development 2011-07-07 13:34:13 -07:00
Xiaohong Bao a9600e5e0d fix for SH-1808: uploading warthog model triggers LLPhysicsDecomp::doDecompositionSingleHull warnings
SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07 10:51:13 -06:00
Brad Payne (Vir Linden) 961d5b1d65 merge 2011-07-09 11:05:29 -04:00
Xiaohong Bao 0400143b4d fix for SH-1808: uploading warthog model triggers LLPhysicsDecomp::doDecompositionSingleHull warnings
SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07 10:51:13 -06:00
prep linden e2ddeb5e5f Fix for SH-1604: missing convex stub license 2011-07-05 13:27:58 -04:00
Brad Payne (Vir Linden) 4bce553a96 merge viewer-development -> mesh-development 2011-07-01 09:41:10 -04:00
Oz Linden b5001ff819 merge changes for storm-1368 2011-06-29 21:20:30 -04:00
Aaron Stone 06e18dd44d STORM-1447 Use <filters>setenv</> stanza rather than grep -v setenv. 2011-06-27 12:43:46 -07:00
Richard Linden af142618f9 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-06-23 11:35:14 -07:00
Richard Linden 70fc5af53f Automated merge with http://hg.secondlife.com/viewer-development 2011-06-23 11:28:23 -07:00
Brad Payne (Vir Linden) 2da45d0237 merge 2011-06-22 13:36:17 -04:00
Nyx (Neal Orman) e029683826 SH-1476 FIX viewer crashes uploading on linux
colladadom was configured to depend on a system library that may not be
up to date on all user's machines. Changed configuration to link statically
against a known version. Verified locally crash does not reproduce.
2011-06-21 18:06:47 -04:00
Kitty Barnett 2dfd8389e5 - fixed : libpng is built with "Whole Program Optimization" and causing slow linker performance
-> "MSIL .netmodule or module compiled with /GL found; restarting link with /LTCG; add /LTCG to the link command line to improve linker performance"
    -> causes the linker to abort the current run and start over

--HG--
branch : Viewer-Build
2011-06-19 01:53:48 +02:00
Kitty Barnett 625749312d - fixed : *OS builds don't set the default Visual Studio project and configuration
--HG--
branch : Viewer-Build
2011-06-18 18:10:14 +02:00
Oz Linden 3444d77609 merge changes for storm-1388 2011-06-17 17:34:27 -04:00
Logan Dethrow 796624d947 STORM-1320 OPEN-21 STORM-312 Update libndofdev on linux. Fixes spacenavigator. 2011-06-17 13:07:14 -04:00
Xiaohong Bao 0b92d52d78 fix for SH-1412: Mesh upload dialog freezes viewer when uploading certain meshes. 2011-06-13 11:52:50 -06:00
callum 7847c8941f EXP-676 FIX As a web developer, I want to access information about the current state of the SL client, such as avatar location 2011-06-09 13:48:35 -07:00
Xiaohong Bao bdf34c2fbf Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation 2011-06-07 18:24:04 -06:00
Xiaohong Bao dfdf6aed23 fix for SH-1765: palm tree model fails to load in viewer 2011-06-07 18:22:09 -06:00
Dave Parks f1784209d5 merge 2011-06-07 14:42:54 -05:00
Xiaohong Bao a3842d9637 fix for SH-588: Uploading a mesh crashes viewer 2011-06-06 23:04:48 -06:00
Richard Linden 960e8c05cb Automated merge with http://hg.secondlife.com/viewer-development 2011-06-02 13:35:15 -07:00
Leyla Farazha 926a9dcb58 merge 2011-06-01 15:44:46 -07:00
Leyla Farazha fe9eccdbae updating slvoice libraries 2011-06-01 15:40:29 -07:00
Arrehn 466364f265 FIRE 3595, Updated autobuild.xml for changes by Nicky Dasmijn 2011-10-19 03:19:12 -04:00
callum 4cd295badd Updated links to new version of LLQtWebKit package for Mac with valid exports file.
Addition of Windows version for completenes. No changes.
2011-05-26 12:42:19 -07:00
Richard Linden 2595d53ded Automated merge with http://hg.secondlife.com/viewer-development 2011-05-25 18:14:55 -07:00
callum ae6ceb6193 Point to updated version of LLQtWebKit that supports local changes., 2011-05-25 10:19:00 -07:00
Loren Shih 781addcbc1 Automated merge up from viewer-development into mesh-development 2011-05-20 11:41:28 -04:00
Xiaohong Bao b1803a8cb9 fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer. 2011-05-19 17:25:42 -06:00
callum 42654e759e Replace older (but working) reference to version of LLQtWebKit for Linux 2011-05-17 17:47:06 -07:00
Oz Linden 9075e1104f fix merge error in open source configurations to disable proprietary components 2011-05-17 19:26:18 -04:00
Nyx (Neal Orman) bd37b14e92 BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail.
copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE
for OS builds. This causes configure to fail as llconvexdecomposition is not
available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so
that llconvexdecompositionstub is used instead. problem only affects windows
builds.
2011-05-17 17:25:38 -04:00
callum 465072626e Typo in Mac/Darwin LLQtWebkit archive name 2011-05-17 10:05:49 -07:00
callum d2c697832f Point to updated (working) builds of LLQtWebKit.
Windows one was missing debug libs/dlls
Mac one was missing updated exports.
Linux one included for completeness.
2011-05-17 09:31:43 -07:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
callum 889f6cc3b3 Merge with tip 2011-05-13 17:09:40 -07:00
callum e4a9704d41 EXP-676 FIX As a web developer, I want to access information about the current state of the SL client, such as avatar location 2011-05-13 17:08:43 -07:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
brad kittenbrink f7a01d7b33 Merge. 2011-05-12 17:08:20 -07:00
Oz Linden 7be1755d61 merge changes for VWR-25727 2011-05-11 08:39:54 -04:00
brad kittenbrink 32bce75124 New build of ogg-vorbis package to fix VWR-25727. 2011-05-10 17:22:34 -07:00
brad kittenbrink 2661a4c2c9 Merge. 2011-05-09 11:26:24 -07:00
Nat Goodspeed 343ffb9d51 Remove Pth library from viewer build.
This library was only needed on the Mac, and only with the OS X 10.4 SDK. As
of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK
we're currently using directly supports the functionality for which we
originally brought in Pth.
2011-05-05 19:23:55 -04:00
Dave Parks 8245e381cb STORM-1210 Make llconvexdecomposition private 2011-05-04 12:54:07 -05:00
Dave Parks 5eed546adf STORM-1210 Public URLs for pcre 2011-05-04 12:45:40 -05:00
Dave Parks 36c671cf15 STORM-1210 Update PCRE libs for mac and linux. 2011-05-04 12:12:42 -05:00
brad kittenbrink a8ba89eb41 Fix for CHOP-619. Found a general solution to our vs2010 precompiled headers problems and eliminated all our special cases for handling them. 2011-05-03 18:15:00 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Oz Linden 1cfe556769 STORM-1215: restore INSTALL_PROPRIETARY in Release builds, remove incorrect use of LL_RELEASE_FOR_DOWNLOAD from ReleaseOS 2011-05-02 09:25:08 -04:00
Brad Payne (Vir Linden) 67be82ad37 updated llconvexdecomposition for version linked with vs2010 havok 2011-04-28 11:00:27 -04:00
Merov Linden e6bd982c00 OPEN-50 : backing out that change that is incompatible with Incredibuild. 2011-04-27 10:47:41 -07:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Dave Parks 0349d1f291 Update convex decomp stub to include latest api changes. 2011-04-22 01:17:19 -05:00
Dave Parks 33eb030bc0 Update llconvexdecompositionstub for new package layout. 2011-04-22 00:05:04 -05:00
Nyx (Neal Orman) f5c4c89a44 Automated merge with https://hg.secondlife.com/mesh-development 2011-04-21 18:07:36 -04:00
Nyx (Neal Orman) ac40560782 reversing the elimination of the stub build of convexdecomp, as we still need
the binary version, even with the full LL source being available. This is because
the binary package of the full version is not redistributable due to having the
havok binaries in it.
2011-04-21 18:07:31 -04:00
Dave Parks 62208046ae merge 2011-04-21 16:37:03 -05:00
Dave Parks 58b48137ca Touch up autobuild xml from merge. 2011-04-21 16:35:09 -05:00
Dave Parks 19857d0cf0 merge 2011-04-21 16:23:00 -05:00
Oz Linden a4decda79b explicitly enable INSTALL_PROPRIETARY in the Linden configurations 2011-04-21 16:40:16 -04:00
Oz Linden a604bc27e5 restore use of proprietary libs (merge error) in Release builds 2011-04-21 10:12:36 -04:00
Oz Linden 120f31502e merge changes for storm-1183 2011-04-20 20:22:54 -04:00
Xiaohong Bao a357815604 update the collada lib of Mac to the rev 227230 to fix the missed minizip problem. 2011-04-20 18:10:33 -06:00
Nat Goodspeed c7721b86c6 New openssl package solves permissions problems with Linux build.
The original Linux openssl tarball includes libcrypto.so and libssl.so files
with r-xr-xr-x permissions: not even the owning user can modify them. This
causes problems when the Release build tries to 'strip' the viewer and all
associated libraries. Newer openssl tarball fixes permission problems.
The newer openssl package also updates from 0.9.8 to 1.0.0, so have to fix
version numbers in Copy3rdPartyLibs.cmake and viewer_manifest.py too. :-P
Presumably the only reason this hasn't been causing trouble with TC builds is
that the link has been picking up system libraries instead of the ones from
the openssl package.
2011-04-19 21:43:13 -04:00
Nat Goodspeed 2866e1d9e1 Update freetype package: previous one had no actual library.
Evidently the only reason builds have been succeeding is because the link is
picking up the system freetype library. This could be tricky if it goes out of
sync with the freetype package's header files.
2011-04-19 21:32:10 -04:00
Brad Payne (Vir Linden) 17a70ddf8f merge 2011-04-15 17:12:42 -04:00
Brad Payne (Vir Linden) b6ae8b1156 moved to public llconvexdecomposition builds 2011-04-15 17:12:07 -04:00
Xiaohong Bao 5a3fb5349d Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-15 14:25:57 -06:00
Xiaohong Bao f9f8479472 update collada lib for linux to 226716 2011-04-15 14:25:32 -06:00
Brad Payne (Vir Linden) 47d4dc301f merge 2011-04-15 11:36:43 -04:00
Brad Payne (Vir Linden) c81ae1a3fa removed separate stub lib, since llconvexdecomposition is going public and includes the stub 2011-04-15 11:04:09 -04:00
prep linden 298d71b4d9 License update 2011-04-15 11:02:57 -04:00
prep linden 2851141ee6 merge 2011-04-15 10:48:13 -04:00
prep linden fcfb70f01d License update 2011-04-15 10:47:44 -04:00
Brad Payne (Vir Linden) 88ae509ed9 merge 2011-04-15 10:34:57 -04:00
Brad Payne (Vir Linden) a0359e3241 updated to new llconvexdecomposition build (now with 100% more vs2010) 2011-04-15 10:34:23 -04:00
Xiaohong Bao ed2f4797da update linux glod lib to change 226657. 2011-04-14 17:19:25 -06:00
Xiaohong Bao 6b49a5f67c update to the latest glod lib for linux. 2011-04-14 15:18:49 -06:00
Xiaohong Bao 77575dae62 update to use 32-bit pcre lib for linux. 2011-04-14 14:43:56 -06:00
Dave Parks 6ec5e332fb Linux build should use 3p-google-perftools build result 2011-04-14 13:24:21 -05:00
Dave Parks 4f3b3abb87 autobuild doesn't like comments? 2011-04-14 12:36:30 -05:00
Dave Parks 4d395e9e62 Linux not windows (whoops) 2011-04-14 12:22:01 -05:00
Dave Parks b4b3c4f763 Include glext headers on linux. 2011-04-14 11:56:33 -05:00
Xiaohong Bao 7dfa297be1 update to use the latest collada lib, which is built on the 32bit pcre lib. 2011-04-13 18:08:21 -06:00
Dave Parks dbb7cd6910 Fix for bad kdu URLs 2011-04-13 16:40:20 -05:00
Dave Parks c094102445 Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-13 16:33:53 -05:00
Dave Parks bf36625332 Fix for bad fmod URL's 2011-04-13 16:33:41 -05:00
Brad Payne (Vir Linden) 6db302578a newer glod, colladadom builds on mac 2011-04-13 16:58:04 -04:00
Brad Payne (Vir Linden) 7b62a960d1 merge 2011-04-13 16:50:11 -04:00
Dave Parks 12f9f521ee Fix for bad default setting and libpng using /GL 2011-04-13 13:43:32 -05:00
Brad Payne (Vir Linden) e0c509d463 updated builds used for pcre, collada on mac 2011-04-12 14:39:31 -04:00
Dave Parks 2027eb8c2b Backed out changeset: c5a0cc9abf49 2011-04-12 12:27:03 -05:00
Dave Parks b13b6ef014 New tcmalloc. 2011-04-12 12:07:45 -05:00
niel@nirvana.planescape.home 36d528e5df OPEN-50 Adding LL_RELEASE_FOR_DOWNLOAD to ReleaseOS's common settings. 2011-04-11 21:29:50 +01:00
niel@nirvana.planescape.home 8fbe2bc2d6 OPEN-50 Adding settings to Windows for controlling proprietary libs. This allows quictime to be used. Additionally, once a solution for FMOD is found this can also be enabled. 2011-04-11 21:27:24 +01:00
niel@nirvana.planescape.home a32080afac OPEN-50 Removing unnecessary FMOD=FALSE from common. INSTALL_PROPRIETARY=FALSE covers this. 2011-04-11 21:24:04 +01:00
niel@nirvana.planescape.home d4ac1fec77 OPEN-50 Moved USE_PRECOMPILED_HEADERS=ON from common, to Windows only settings as it doesn't appear to be used by others. 2011-04-11 21:04:02 +01:00
Dave Parks 675e0cfd99 Use tcmalloc from 3p-google-perftools on windows 2011-04-11 14:12:49 -05:00
niel@nirvana.planescape.home 86a66cea74 OPEN-50 Adding missing options for VC Release build 2011-04-09 16:44:02 +01:00
Nyx (Neal Orman) a6d87cbfea updated colladadom package with header files in the correct location. 2011-04-08 21:18:35 -04:00
Nyx (Neal Orman) 235a4477ab updating GLOD libraries to be 2010/autobuild compatible.
Linux was manually built as our build machines are having difficulties
building it. Will revisit this later.
2011-04-08 19:54:36 -04:00
Nyx (Neal Orman) 0f245490a4 updating colladadom libraries to use the newly autobuilt versions. 2011-04-08 19:04:01 -04:00
Brad Payne (Vir Linden) d490081fe2 changes for newer collada build 2011-04-08 17:12:26 -04:00
niel@nirvana.planescape.home fa5852a710 OPEN-50 Changed the default number of job slots, for Linux configurations, to a level (2) that all should be able to manage. 2011-04-07 14:27:39 +01:00
niel@nirvana.planescape.home b996d6cb6a OPEN-50 Moving common configuration arguments to the common entries. 2011-04-07 12:54:17 +01:00
niel@nirvana.planescape.home 8cf15f1778 OPEN-50 Adding UNATTENDED=ON to Windows' configurations so that the viewer can be built by all users out-of-the-box. OS Devs with full VS can switch it on if they want, however this is not needed any more for Open Source builds. 2011-04-07 12:41:43 +01:00
niel@nirvana.planescape.home 31576e2d51 OPEN-50 Changing windows build command from 'devenv.com', to 'msbuild.exe' along with associated options and arguments. 2011-04-06 23:26:05 +01:00
Brad Payne (Vir Linden) 82572bd3a9 merge 2011-04-06 15:54:51 -04:00
Brad Payne (Vir Linden) 3e5961d183 Updated llconvexdecomposition library build 2011-04-06 15:54:27 -04:00
Dave Parks 3b32c128fc merge 2011-04-06 14:45:41 -05:00
Dave Parks 1e1fde5eb1 OPEN-58 Ditch GL package for glext.h package since glut.h isn't used anywhere. Probably don't need glext headers for mac or linux as they come in with system updates. 2011-04-06 14:45:27 -05:00
Nyx (Neal Orman) a738dcaa8b tcmalloc rename 2011-04-06 13:52:42 -04:00
Oz Linden 8f0d59cab3 OPEN-50 (partial): refactor cmake switches to common configurations and default values 2011-04-06 05:46:45 -04:00
Oz Linden 8d452969db remove unused configurations for standalone, and change open source configuration names from "OpenSource" prefix to "OS" suffix 2011-04-05 17:03:40 -04:00
Oz Linden f23bd166fc remove obsolete workaround configurations 2011-04-05 16:48:05 -04:00
Nyx (Neal Orman) 84df608ade initial pass at adding new mesh libraries to autobuild. Needs a license review and some other fixes, but autobuild configure completes successfully. 2011-04-05 14:11:28 -04:00
Andrew A. de Laix 7054aaba6d use private locations for fmod and kdu. 2011-04-04 10:57:13 -07:00
alain@945battery-guestA-183.lindenlab.com 89c838805a Merge 2011-03-30 11:47:03 -07:00
alain@945battery-guestA-183.lindenlab.com 5620e18f5a revert to old llqtwebkit on linux. 2011-03-30 11:46:24 -07:00
Andrew A. de Laix 10741071ab Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010 2011-03-30 10:26:29 -07:00
Andrew A. de Laix 44f418f886 update llqtwebkit archive on darwin. 2011-03-30 10:26:16 -07:00
Alain Linden fe92602391 update windows llqtwebkit archive. 2011-03-29 16:43:38 -07:00
alain@945battery-guestA-183.lindenlab.com 9b7fd9034f revert to prior archive to get vivox compatible opealal lib. 2011-03-25 13:40:10 -07:00
alain@945battery-guestA-183.lindenlab.com f59de62bb2 Merge 2011-03-23 15:27:27 -07:00
alain@945battery-guestA-183.lindenlab.com 63876746dd update jpeglib archive on linux (now uses correct lib layout fixing erroneous linkage to system jpeg lib). 2011-03-23 15:27:03 -07:00
Merov Linden 976381059e Sync 2011-03-23 13:40:56 -07:00
Merov Linden d3b192c26f STORM-1090 : Fix for use of freetype 2.4.4 and switch to freetype 2.4.4 in installables 2011-03-23 13:39:31 -07: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
Alain Linden 76c4324b5d Merge 2011-03-22 10:58:25 -07:00
Alain Linden f06a9369e5 update freetype archive on windows (downgrad to 2.3.9) 2011-03-22 10:36:53 -07:00
Andrew A. de Laix 980f26fff7 update freetype archive on darwin (downgrade to 2.3.9) 2011-03-22 10:34:22 -07:00
Merov Linden f6961ae236 Autobuild : Fix to point all Windows build configs to Visual Studio 10 2011-03-19 14:52:08 -07:00
Merov Linden 9923f40322 Autobuild : fixed merge errors in json hash codes 2011-03-18 16:23:55 -07:00
Merov Linden fef21534e9 OPEN-37 : pull into viewer-autobuild2010 2011-03-18 15:35:20 -07:00
Merov Linden e13f5884aa Autobuild: pull in from jenn_linden/viewer-vs2010 2011-03-18 15:33:14 -07:00
Andrew A. de Laix df2e9b85f0 update archives to permanent S3 locations. 2011-03-18 11:49:44 -07:00
brad kittenbrink dd8c9eb98a Removal of dbghelp cruft.
Reviewed by alain and nat.
2011-03-18 12:24:04 -04:00
Wolfpup Lowenhar 3b1dee9abf OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to
use VS2010 Autobuild
2011-03-18 08:05:36 -04:00
Merov Linden 741de388d3 Autobuild: pull in from jenn_linden/viewer-vs2010 2011-03-17 11:24:22 -07:00
Merov Linden 399d0aa764 Autobuild: fixes an xml error that made configure exit with error 2011-03-16 18:30:50 -07:00
Merov Linden 6ee772bd42 Autobuild 2010: clean up argument passing for all configs 2011-03-16 18:09:00 -07:00
Andrew de Laix 60fe203662 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-16 20:54:18 +00:00
Andrew de Laix 2e0543a168 update linux to lates curl archive (linked to cares). 2011-03-16 20:54:12 +00:00
Andrew A. de Laix 12a539c82d update to latest curl library (linked to cares). 2011-03-16 13:53:06 -07:00
Merov Linden e997db248f Pull from jenn_linden/viewer-vs2010 2011-03-16 09:51:46 -07:00
Andrew de Laix 1e4e9ee69b Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-16 16:06:56 +00:00
Andrew de Laix 38bdbbd019 rename google archive for linux to google-perftools and update to latest. 2011-03-16 16:06:47 +00:00
Andrew A. de Laix 1f5f03da38 fix hash for curl archive on darwin. 2011-03-16 09:05:20 -07:00
Andrew de Laix cd8485f9c0 update uuid archive for linux. 2011-03-15 20:54:22 +00:00
Andrew de Laix 650dd40187 update openal archive for linux. 2011-03-15 19:58:25 +00:00
Merov Linden 918caee18e Pull from jenn_linden/viewer-vs2010 2011-03-15 11:41:10 -07:00
Andrew de Laix 1de3c1e127 update jsoncpp archive on linux. 2011-03-15 18:12:43 +00:00
Merov Linden 35b61cdd44 Pull from jenn_linden/viewer-vs2010 2011-03-14 22:52:11 -07:00
Andrew de Laix e25c56dd67 update zlib archive for linux. 2011-03-14 23:25:23 +00:00
Andrew de Laix f1f57ed5ac update xmlrpc-epi archive for linux. 2011-03-14 23:03:41 +00:00
Andrew de Laix 17343b76df update openssl archive for linux. 2011-03-14 22:43:09 +00:00
Andrew de Laix 72d1febadb update openjpeg archive for linux. 2011-03-14 21:18:24 +00:00
Andrew de Laix ec0c28ad83 update ogg-vorbis archive for linux. 2011-03-14 20:24:55 +00:00
Andrew de Laix c41d9949d7 update llqtwebkit usage. 2011-03-14 20:01:31 +00:00
Andrew de Laix fcdd82af83 update libpng archive for linux. 2011-03-11 23:50:00 +00:00
Andrew de Laix 5b87c94fa7 update kdu archive for linux. 2011-03-11 23:39:38 +00:00
Andrew de Laix 9603d73f1f update jpeglib archive for linux. 2011-03-11 19:32:18 +00:00
Andrew de Laix 8c310339e2 update google_breakpad archive for linux. 2011-03-11 01:39:18 +00:00
Andrew de Laix 44543756d8 update freetype archive for linux. 2011-03-11 00:35:10 +00:00
Andrew de Laix 353c54d668 update fontconfig archive for linux. 2011-03-11 00:27:44 +00:00
Andrew de Laix 2ed71097ab fmod archive updated for linux. 2011-03-11 00:16:23 +00:00
Andrew de Laix f3c54b503a update expat archive for linux. 2011-03-10 22:55:22 +00:00
Andrew de Laix 4a8e5d9df9 update dbusglib archive for linux. 2011-03-10 21:51:13 +00:00
Andrew de Laix 33fbb63227 update curl archive for linux. 2011-03-10 19:05:10 +00:00
Andrew de Laix acec15e723 update boost archive usage for linux. 2011-03-10 17:53:15 +00:00
Andrew de Laix 871677dc0b ares archive updated for linux. 2011-03-10 01:31:40 +00:00
Andrew de Laix 8dee1ed4c7 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-10 00:48:36 +00:00
Andrew de Laix 4947062236 update apr and sdl archives for linux; added new archive db (needed for linux only). 2011-03-10 00:48:20 +00:00
Andrew A. de Laix fb86600a33 update glui archive for darwin. 2011-03-09 09:26:12 -08:00
Andrew A. de Laix eddf24a00f update ndofdev archive usage on darwin. 2011-03-09 08:58:52 -08:00
Andrew A. de Laix 49698a49de update llqtwebkit usage on darwin. 2011-03-08 14:14:57 -08:00
Andrew A. de Laix b1a71cbcd2 update fmod and kdu archive usage for mac. 2011-03-08 11:02:10 -08:00
Andrew A. de Laix a60bf285b8 really update google_breakpad archive usage for darwin. 2011-03-08 09:18:44 -08:00
Andrew A. de Laix e1de26e097 merge fix to linux google_breakpad archive. 2011-03-07 16:36:00 -08:00
Andrew A. de Laix 3ebe0dd12b Backed out changeset 7f3922c6bbc4 -- updated linux by mistake. 2011-03-07 16:35:08 -08:00
Andrew A. de Laix 1f4630a967 updating zlib archive for darwin. 2011-03-07 16:18:09 -08:00
Andrew A. de Laix d107e4b0a7 update xmlrpc-epi archive for darwin. 2011-03-07 16:08:56 -08:00
Andrew A. de Laix 64293a808c update pth archive usage for darwin. 2011-03-07 15:21:47 -08:00
Andrew A. de Laix e77de93529 update openjpeg archive usage for darwin. 2011-03-07 15:09:15 -08:00
Andrew A. de Laix d9715317b1 update openSSL archive usage for darwin. 2011-03-07 14:54:50 -08:00
Andrew A. de Laix 12c2fd2ef0 update ogg-vorbis archive usage for darwin. 2011-03-07 14:23:09 -08:00
Andrew A. de Laix 33927b8451 update libpng and jpeglib archives for mac. 2011-03-07 11:44:51 -08:00
Andrew A. de Laix 7587b1b3bb update mac google_breakpad archive. 2011-03-07 10:43:18 -08:00
Andrew A. de Laix 006674447a update darwin freetype archive. 2011-03-07 09:50:05 -08:00
Andrew A. de Laix 7285dd9e42 ares, boost, expat, freetype archives updated to latest builds. 2011-03-04 14:49:20 -08:00
Oz Linden c20eb01ff2 pull up changes from viewer-autobuild 2011-03-03 21:18:15 -05:00
Andrew A. de Laix fb8a2aa572 imported patch mac_archives 2011-03-03 16:51:21 -08:00
Alain Linden 58e5c8476d update to use new GL archive (includes only headers; that's all that is needed) 2011-03-03 16:15:08 -08:00
Alain Linden 9bd9a55608 hacky addition of VSTool postprocessing to set startup project and default configuration. 2011-03-03 14:42:48 -08:00
Merov Linden 149ace0b1f Autobuild : points to the corrected pth package for Mac 2011-03-03 11:28:06 -08:00
Oz Linden 856a6992eb pull latest changes from viewer-vs2010 2011-03-03 07:50:40 -05:00
Oz Linden b7c49f0f47 merge up from viewer-development and viewer-autobuild 2011-03-03 07:20:54 -05:00
Alain Linden fa20a6de08 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-02 15:07:04 -08:00
Alain Linden f680c91a09 update openjpeg package usage for windows. 2011-03-02 14:50:49 -08:00
Andrew de Laix 99ba5e2670 revert to old jsoncpp library on linux to fix build. 2011-03-02 21:28:26 +00:00
Andrew de Laix 49f5a3ec7d Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-02 17:50:05 +00:00
Andrew de Laix 899d0d6282 update to jsoncpp built with gcc4.1 2011-03-02 17:49:59 +00:00
Jennifer Leech 9256402b06 Attempting to modify quoting of build options string to see if this corrects failure to run BuildConsole on TC. 2011-03-02 00:31:38 -08:00
Jennifer Leech 7093503e26 Attempting to configure VS2010 to only use one processor core to troubleshoot conflict with TC. 2011-03-01 19:54:17 -08:00
Alain Linden 88f507f9cc fixes to get openal working on windows. 2011-03-01 15:32:35 -08:00
Oz Linden 7f00a037ee update to TeamCity build from https://bitbucket.org/lindenlab/3p-elfio 2011-02-25 12:36:17 -05:00
Oz Linden 781bd2ce19 sync to latest viewer-development and viewer-autobuild 2011-02-24 22:31:35 -05:00
Oz Linden ed73c8bf63 pull latest changes from viewer-vs2010 2011-02-24 22:27:08 -05:00
Oz Linden 2e74612778 Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-24 22:23:13 -05:00
Oz Linden b1787a19d3 change to canonical build of the pth lib 2011-02-24 21:40:18 -05:00
Jennifer Leech 7aca14a77a Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-24 16:07:20 -08:00
Jennifer Leech 713933fa76 Merged changes from bitbucket.org/squire_linden/viewer-vs2010 2011-02-24 15:59:52 -08:00
Alain Linden 2c27d43228 update to fixed debug google-mock archive. 2011-02-24 15:43:50 -08:00
Merov Linden d8944cfef3 Windows uses updated fmod archive and vs2010 compiled kdu archive. 2011-02-24 14:07:03 -08:00
Alain Linden 1db3f3b5ce integrate xmlrpc-epi into windows build. 2011-02-24 12:27:58 -08:00
Alain Linden f939b95d0c update windows to use new libndofdev and google-mock archives. 2011-02-23 15:50:03 -08:00
Alain Linden 62feb3b4bc windows uses updated ogg-vorbis archive. 2011-02-22 14:54:28 -08:00
Alain Linden 50a4cb1dfc Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-22 10:50:31 -08:00
Alain Linden 0130a0801e update google_breakpad archive usage on windows. 2011-02-22 10:49:32 -08:00
squire 531de7491b Changes windows build and PNG cmake to reflect latests libpng builds 2011-02-21 18:57:54 -08:00
Oz Linden 415b3ca1da Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-23 06:47:57 -05:00
callum ece9940bff Pull in FreeType 2.4.4 for Windows (built using AutoBuild) 2011-02-19 09:33:49 -08:00
Oz Linden 7b9d54379f use improved packaging for jsoncpp 2011-02-18 21:29:25 -05:00
Alain Linden 69855f9d34 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-18 16:07:58 -08:00
Alain Linden efc572339d remove installable mesa for windows; not used. 2011-02-18 16:06:56 -08:00
callum 14e09f9f79 Pull in autobuild derrived jpeglib (version 8c) for Windows MSVC 2010 2011-02-18 13:33:58 -08:00
Oz Linden c89e281de1 merge changes from jenn_linden/viewer-vs2010 2011-02-17 21:01:23 -05:00
Alain Linden 2ab9ba026e update to latest apr_suite package. 2011-02-17 17:49:03 -08:00
Oz Linden 75f7aca107 Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-16 18:24:03 -05:00
Alain Linden 8af932de1f use new packages. 2011-02-16 14:06:50 -08:00
Alain Linden 18a49e58ea update curl and dependent installed archies to vs2010 builds. 2011-02-11 15:18:11 -08: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
Oz Linden 9251d95205 OPEN-1: (partial) use environment when building with Visual Studio Express 2011-02-10 14:41:00 -05:00
Alain Linden c2bfa25299 update pacageing of msvc?100.dll's; use latest qt package with all needed libs. 2011-02-07 16:46:18 -08:00
Alain Linden ceeffc6c92 use up to date openssl package. 2011-02-07 12:56:58 -08:00
Alain Linden ed4661b607 update packages. 2011-02-07 10:00:33 -08:00
Oz Linden eb68b5fa0a OPEN-1 WORKAROUND correct build arguments again for VS Express 2011-02-06 10:37:42 -05:00
Oz Linden 0c6de5c6cc OPEN-1 WORKAROUND correct build arguments for VS Express 2011-02-06 10:09:58 -05:00
Oz Linden 82d9e1b73e OPEN-1 WORKAROUND revert change to cmake string for VS 8 2011-02-06 09:56:09 -05:00
Oz Linden 7e19ef5b4f OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling with VS Express 2011-02-06 08:50:06 -05:00
Alain Linden cbffa57351 fix linking to llqtwebkit. 2011-02-04 12:52:36 -08:00
Alain Linden 3f78394f42 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-01-31 15:56:40 -08:00
Alain Linden 48bf6b19b3 build uses latest jsoncpp package with new layout. 2011-01-31 15:55:42 -08:00
Andrew A. de Laix 8adcaa147d update mac and linux json libs. 2011-01-31 15:19:49 -08:00
Alain Linden f05f2412b2 patches to use new jsoncpp lib on windows 2011-01-31 12:31:36 -08:00
Alain Linden 3895be8e25 update to use patched quicktime package 2011-01-27 17:16:27 -08:00
Alain Linden 287143080b use patched llqtwebkit library on windows. 2011-01-27 14:57:20 -08:00
Alain Linden 5833672c5c fix quoting of vs8 generator string. 2011-01-26 16:09:40 -08:00
Andrew A. de Laix 216c3b4771 adding OpenSource* and OpenSourceStandAlone* configurations. 2011-01-26 15:57:48 -08:00
Andrew A. de Laix ed8aef42e1 windows uses llqtwebkit now published on s3. 2011-01-26 09:07:20 -08:00
jenn c2d1f9215a Merge in changes from mani_linden/viewer-vs2010 2011-01-25 10:36:14 -08:00
Mark Palange (Mani) 6dd086794f Updated boost lib 2011-01-24 12:04:49 -08:00
Alain Linden a7c7d09c16 Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild 2011-01-20 17:13:08 -08:00
Andrew A. de Laix 00c9123919 add license information derived from istall.xml 2011-01-20 16:59:33 -08:00
Andrew A. de Laix 67fdd528fd update mac and linux curl packages to use expected lib layout. 2011-01-20 16:17:15 -08:00
Andrew A. de Laix e421ffa3a7 update linux slvoice pacakge. 2011-01-20 15:16:02 -08:00
Alain Linden e59a2f94c7 update slvoice package. 2011-01-20 15:06:53 -08:00
Andrew A. de Laix ea8c2b1fa1 update curl lib to fixed archive. 2011-01-20 14:32:03 -08:00
Andrew A. de Laix 785d3ce425 update slvoice library on mac. 2011-01-20 14:15:09 -08:00
Andrew A. de Laix 3cae4f41a0 update curl library used. 2011-01-20 11:25:16 -08:00
jenn f6197abb09 Updated google_breakpad package on linux in autobuild.xml. Previously omitted a necessary include file. 2011-01-19 16:21:10 -08:00
jenn 0a9d62f54b Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild 2011-01-19 14:16:39 -08:00
jenn 00f8de0666 Update 'kdu' for linux in autobuild.xml. Old version had deprectated package structure. 2011-01-19 14:14:40 -08:00
Andrew A. de Laix 7f5c6f34f2 Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild 2011-01-19 12:12:07 -08:00
Andrew A. de Laix a339c948b5 update google-breakpad package; fix call to dump symbols. 2011-01-19 12:11:54 -08:00
jenn c4713b4f9f Added 'kdu' to autobuild.xml for linux. 2011-01-18 17:18:29 -08:00
jenn 19293991b7 Added 'slvoice' (vivox) to autobuild.xml for linux.
This is version 3.1 of the lib; viewer was using version 3.2, but this version has been rebuilt using the new package layout. Hopefully it will work, though we may need to convert version 3.2 if it does not.

Updated Copy3rdParyLibs.cmake paths for linux installation of vivox files.
2011-01-18 16:27:18 -08:00
Andrew A. de Laix f38c18bb3d reduce mac log spam. 2011-01-18 13:28:53 -08:00
Andrew A. de Laix c89cc27f1a Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild 2011-01-18 10:44:48 -08:00
Andrew A. de Laix bae82a240c use platform specific build commands. 2011-01-18 10:44:27 -08:00
jenn 3150fb0021 Added entries to autobuild.xml for 'openal_soft' and 'google' libs on linux.
These packages have been rebuilt to use the new package layout (thanks alain!).
'openal_soft' was also renamed to use an underscore in its name rather than a dash.
2011-01-18 09:59:34 -08:00
Alain Linden 738c754608 windows autobuildibatized (bye bye install.py...) 2011-01-14 09:03:22 -08:00
Andrew A. de Laix b7637e58be mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
Andrew A. de Laix 5d3e7c8e7e add licence file information 2011-01-12 11:56:25 -08:00
Andrew A. de Laix 35c259b603 first pass at packages that need to be installed through autobuild. 2011-01-12 09:28:21 -08:00
Andrew A. de Laix fabcf9c8e0 autobuild configuration to build the viewer (dependencies still handled by install.py) 2011-01-11 15:59:22 -08:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00