Commit Graph

3449 Commits (master)

Author SHA1 Message Date
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