c2bfa25299
update pacageing of msvc?100.dll's; use latest qt package with all needed libs.
2011-02-07 16:46:18 -08:00
ec13a029e8
branch for growl.
...
--HG--
branch : growl
2011-02-02 14:30:09 -08:00
1ba64d9b14
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2011-01-24 14:28:51 -08:00
d0cba9e919
Automated merge up from viewer-development into mesh-development
2011-01-24 10:56:40 -05:00
0d6ec39f44
Cmake updates to get llkdu building on linux. Need to rebuild kdu tarball next.
2011-01-19 10:03:51 -08:00
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
86acdedc63
fix path to prebiuld slvoice libraries on mac and linux.
2011-01-18 13:18:04 -08:00
738c754608
windows autobuildibatized (bye bye install.py...)
2011-01-14 09:03:22 -08:00
b7637e58be
mac buiding with autobuild and autobuild style packages (just say no to install.py)
2011-01-13 13:09:27 -08:00
6150e4ed7c
VWR-24347 Fix reversion--allow VS2005 Express user to specify location of msvc* files
2010-12-29 18:25:40 -05:00
a86e35aa0d
Automated merge up from viewer-development
2010-12-22 13:02:36 -05:00
aafd7abd70
SH-467 FIX fix of VWR-20809/SNOW-504 lost in merge
...
re-applying the fix originally committed as c5ddd1e361ae.
This allows standalone builds to not depend on stage_third_party_libs
but was lost in a merge as referenced in jira. Re-reviewed the code
in the patch and it is a valid fix.
2010-11-22 16:44:58 -05:00
52f397ec7a
SH-350 SH-351 SH-355 FIX ARC fixes
...
Had a few debugging lines in my last checkin.
Cleaning up unreviewed changes.
2010-11-18 17:28:13 -05:00
5e57352e12
SH-350 SH-351 SH-355 FIX Several fixes for ARC
...
Fixed the texture resolution calculation against the rounding errors
we had before.
Fixed the bug where linking prims changed the combined cost
Fixed the bug where twisting was not computed properly
Code reviewed by davep.
2010-11-18 16:42:57 -05:00
ba3307b8d0
merge with STORM-105
2010-11-04 18:09:35 -07:00
fefae4c639
SH-396 WIP fix mac teamcity build for mesh-development
...
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04 16:26:27 -04:00
dac53830f1
STORM-104 : make kdu statically linked, suppress the need for llkdu
2010-10-27 23:40:35 -07:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
c0d882fbff
Updated colladadom.
2010-10-14 11:26:59 -05:00
6fc3de7b2d
Merge
2010-10-15 13:36:10 -07:00
d1ad7a56be
STORM-137 : Build script modif so that Windows build does not rely on fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly.
2010-10-02 18:30:52 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
f73a0c2e13
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
2010-09-23 16:46:08 -04:00
1ac289bac9
SH-211 FIX update viewer-mesh branch to use new tcmalloc package
...
Finished changes to make viewer-mesh make use of tcmalloc on linux.
Almost all changes are juggling cmake config files, to make sure
that the package is downloaded, installed, moved at the right times,
and linked at the right times.
Code reviewed by Seraph
2010-09-23 16:46:02 -04:00
7f9285979d
WIP make tcmalloc work on linux (JIRA pending)
...
First pass at integrating the linux version of tcmalloc.
Code will be reviewed in a later commit before pushing.
2010-09-23 14:59:03 -04:00
245842a765
SH-64 update GLOD on mac
...
updated GLOD again to be searched for in the correct place and
updated some cmake configuration to ensure that it is being referred to
in the correct places.
This appears to finally solve our mac startup crash.
2010-09-23 11:25:40 -04:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
bee6028184
SNOW-606 REVERT libuuid removal
...
backing out patch from SNOW-606 as it breaks the build on our linux
build machines. Can be re-applied when our build machines get an updated
version of libuuid.
2010-09-16 14:54:23 -04:00
13180604e5
SNOW-606 FIX disable packaging of libuuid
...
Patch taken from JIRA, committing locally to fix our project branch.
Code reviewed by Nyx / Brad
2010-09-08 11:30:50 -04:00
c4d86b9e4e
Include libexpat.so.1 in the list of libs to copy.
2010-09-13 14:51:31 -07:00
b9853f8e09
VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a standalone build.
2010-08-19 13:31:45 +01:00
37a8c12bd3
merge
2010-06-14 23:04:11 -05:00
0bf02ad820
VPLAT-268: Update Mac for relative-path libexception_handler.dylib
...
Also add the dylib to Copy3rdPartyLibs.cmake so unit tests can find it.
2010-05-26 12:21:55 -04:00
d9fee67f97
VPLAT-237 Linux client library package for google_breakpad.
2010-05-21 19:09:53 -07:00
f5f20a7851
got rid of tab
2010-01-29 15:06:55 -08:00
c504c40a75
Added glod.txt and libraries no longer unzipped into newview
2010-01-29 15:04:14 -08:00
25a773d79c
DEV-43896 solve render-pipeline linux mesh gzopen64 problem
...
I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.
2009-12-08 11:39:44 -08:00
36ec149bef
Removed libtcmalloc_minimal.dll from the default build.
...
Reviewed by Palmer
2009-12-02 16:00:22 -08:00
de92d5ce32
re-upgrade to vivox v3 sdk here.
2009-11-23 17:57:25 +00:00
dd3c7a1a25
Fix for errors with integration tests failing to find libcrypto.so.0.9.7
2009-11-20 15:35:19 -05:00
d57c20787a
Fix for mac failure in apr shared lib staging (Part of DEV-41724)
2009-11-10 14:04:05 -05:00
06ba4927aa
Changed copy of libuuid.so to libuuid.so.1
2009-11-06 17:19:47 -08:00
f9c4682fb3
Continuing work on DEV-41724/DEV-41725 normalizing shared lib staging.
...
It's basically working on linux.
2009-11-03 18:35:36 -05:00
90ea3d3b35
Implemented linux staging for DEV-41722 normalizing shared lib staging.
2009-11-02 16:53:50 -05:00
35469b04a0
Implemented mac staging for DEV-41722 normalizing shared lib staging.
...
also added a bunch of comments.
2009-11-02 13:52:44 -05:00
f3d13666f6
continuing work on DEV-41722 normalizing shared lib staging. fixed copy/paste
...
error in the last commit(f5da14574943).
2009-10-30 18:21:35 -04:00
cddf7f19c5
continuing work on DEV-41722 normalizing shared lib staging.
...
started factoring out copying into common section while file lists are
initialized above in platform specific sections.
2009-10-30 18:14:58 -04:00
89e3523052
More work for DEV-41722 normalizing shared lib staging on all 3 platforms.
...
Started refactoring Copy3rdPartyLibs.cmake to use common commands with platform
specific variables.
2009-10-26 18:13:20 -04:00
a17ca8260a
Beginning work for DEV-41722 normalizing shared lib staging on all 3 platforms. Renamed CopyWinLibs.cmake to Copy3rdPartyLibs.cmake.
2009-10-26 16:08:43 -04:00
Alain Linden