Dave Parks
8a92612fd9
merge
2011-05-16 12:34:15 -05: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