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
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
7be1755d61
merge changes for VWR-25727
2011-05-11 08:39:54 -04:00
32bce75124
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
2661a4c2c9
Merge.
2011-05-09 11:26:24 -07:00
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
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
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
e6bd982c00
OPEN-50 : backing out that change that is incompatible with Incredibuild.
2011-04-27 10:47:41 -07:00
a4decda79b
explicitly enable INSTALL_PROPRIETARY in the Linden configurations
2011-04-21 16:40:16 -04:00
a604bc27e5
restore use of proprietary libs (merge error) in Release builds
2011-04-21 10:12:36 -04:00
120f31502e
merge changes for storm-1183
2011-04-20 20:22:54 -04:00
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
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
36d528e5df
OPEN-50 Adding LL_RELEASE_FOR_DOWNLOAD to ReleaseOS's common settings.
2011-04-11 21:29:50 +01:00
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
a32080afac
OPEN-50 Removing unnecessary FMOD=FALSE from common. INSTALL_PROPRIETARY=FALSE covers this.
2011-04-11 21:24:04 +01:00
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
86a66cea74
OPEN-50 Adding missing options for VC Release build
2011-04-09 16:44:02 +01:00
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
b996d6cb6a
OPEN-50 Moving common configuration arguments to the common entries.
2011-04-07 12:54:17 +01:00
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
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
8f0d59cab3
OPEN-50 (partial): refactor cmake switches to common configurations and default values
2011-04-06 05:46:45 -04:00
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
f23bd166fc
remove obsolete workaround configurations
2011-04-05 16:48:05 -04:00
7054aaba6d
use private locations for fmod and kdu.
2011-04-04 10:57:13 -07:00
89c838805a
Merge
2011-03-30 11:47:03 -07:00
5620e18f5a
revert to old llqtwebkit on linux.
2011-03-30 11:46:24 -07:00
10741071ab
Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010
2011-03-30 10:26:29 -07:00
44f418f886
update llqtwebkit archive on darwin.
2011-03-30 10:26:16 -07:00
fe92602391
update windows llqtwebkit archive.
2011-03-29 16:43:38 -07:00
9b7fd9034f
revert to prior archive to get vivox compatible opealal lib.
2011-03-25 13:40:10 -07:00
f59de62bb2
Merge
2011-03-23 15:27:27 -07:00
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
976381059e
Sync
2011-03-23 13:40:56 -07:00
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
616b0a2568
Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545).
2011-03-23 10:44:39 -07:00
76c4324b5d
Merge
2011-03-22 10:58:25 -07:00
f06a9369e5
update freetype archive on windows (downgrad to 2.3.9)
2011-03-22 10:36:53 -07:00
980f26fff7
update freetype archive on darwin (downgrade to 2.3.9)
2011-03-22 10:34:22 -07:00
f6961ae236
Autobuild : Fix to point all Windows build configs to Visual Studio 10
2011-03-19 14:52:08 -07:00
9923f40322
Autobuild : fixed merge errors in json hash codes
2011-03-18 16:23:55 -07:00
fef21534e9
OPEN-37 : pull into viewer-autobuild2010
2011-03-18 15:35:20 -07:00
e13f5884aa
Autobuild: pull in from jenn_linden/viewer-vs2010
2011-03-18 15:33:14 -07:00
df2e9b85f0
update archives to permanent S3 locations.
2011-03-18 11:49:44 -07:00
dd8c9eb98a
Removal of dbghelp cruft.
...
Reviewed by alain and nat.
2011-03-18 12:24:04 -04:00
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
741de388d3
Autobuild: pull in from jenn_linden/viewer-vs2010
2011-03-17 11:24:22 -07:00
399d0aa764
Autobuild: fixes an xml error that made configure exit with error
2011-03-16 18:30:50 -07:00
Arrehn