Commit Graph

177 Commits (b15dca22637b0b2c1947b758a93f51163fb48cf1)

Author SHA1 Message Date
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
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
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
niel@nirvana.planescape.home 86a66cea74 OPEN-50 Adding missing options for VC Release build 2011-04-09 16:44:02 +01: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
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
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