77575dae62
update to use 32-bit pcre lib for linux.
2011-04-14 14:43:56 -06:00
6ec5e332fb
Linux build should use 3p-google-perftools build result
2011-04-14 13:24:21 -05:00
4f3b3abb87
autobuild doesn't like comments?
2011-04-14 12:36:30 -05:00
4d395e9e62
Linux not windows (whoops)
2011-04-14 12:22:01 -05:00
b4b3c4f763
Include glext headers on linux.
2011-04-14 11:56:33 -05:00
7dfa297be1
update to use the latest collada lib, which is built on the 32bit pcre lib.
2011-04-13 18:08:21 -06:00
dbb7cd6910
Fix for bad kdu URLs
2011-04-13 16:40:20 -05:00
c094102445
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
2011-04-13 16:33:53 -05:00
bf36625332
Fix for bad fmod URL's
2011-04-13 16:33:41 -05:00
6db302578a
newer glod, colladadom builds on mac
2011-04-13 16:58:04 -04:00
7b62a960d1
merge
2011-04-13 16:50:11 -04:00
12f9f521ee
Fix for bad default setting and libpng using /GL
2011-04-13 13:43:32 -05:00
e0c509d463
updated builds used for pcre, collada on mac
2011-04-12 14:39:31 -04:00
2027eb8c2b
Backed out changeset: c5a0cc9abf49
2011-04-12 12:27:03 -05:00
b13b6ef014
New tcmalloc.
2011-04-12 12:07:45 -05: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
675e0cfd99
Use tcmalloc from 3p-google-perftools on windows
2011-04-11 14:12:49 -05:00
86a66cea74
OPEN-50 Adding missing options for VC Release build
2011-04-09 16:44:02 +01:00
a6d87cbfea
updated colladadom package with header files in the correct location.
2011-04-08 21:18:35 -04:00
235a4477ab
updating GLOD libraries to be 2010/autobuild compatible.
...
Linux was manually built as our build machines are having difficulties
building it. Will revisit this later.
2011-04-08 19:54:36 -04:00
0f245490a4
updating colladadom libraries to use the newly autobuilt versions.
2011-04-08 19:04:01 -04:00
d490081fe2
changes for newer collada build
2011-04-08 17:12:26 -04: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
82572bd3a9
merge
2011-04-06 15:54:51 -04:00
3e5961d183
Updated llconvexdecomposition library build
2011-04-06 15:54:27 -04:00
3b32c128fc
merge
2011-04-06 14:45:41 -05:00
1e1fde5eb1
OPEN-58 Ditch GL package for glext.h package since glut.h isn't used anywhere. Probably don't need glext headers for mac or linux as they come in with system updates.
2011-04-06 14:45:27 -05:00
a738dcaa8b
tcmalloc rename
2011-04-06 13:52:42 -04: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
84df608ade
initial pass at adding new mesh libraries to autobuild. Needs a license review and some other fixes, but autobuild configure completes successfully.
2011-04-05 14:11:28 -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
6ee772bd42
Autobuild 2010: clean up argument passing for all configs
2011-03-16 18:09:00 -07:00
60fe203662
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-03-16 20:54:18 +00:00
2e0543a168
update linux to lates curl archive (linked to cares).
2011-03-16 20:54:12 +00:00
12a539c82d
update to latest curl library (linked to cares).
2011-03-16 13:53:06 -07:00
e997db248f
Pull from jenn_linden/viewer-vs2010
2011-03-16 09:51:46 -07:00
1e4e9ee69b
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-03-16 16:06:56 +00:00
38bdbbd019
rename google archive for linux to google-perftools and update to latest.
2011-03-16 16:06:47 +00:00
1f5f03da38
fix hash for curl archive on darwin.
2011-03-16 09:05:20 -07:00
cd8485f9c0
update uuid archive for linux.
2011-03-15 20:54:22 +00:00
650dd40187
update openal archive for linux.
2011-03-15 19:58:25 +00:00
918caee18e
Pull from jenn_linden/viewer-vs2010
2011-03-15 11:41:10 -07:00
1de3c1e127
update jsoncpp archive on linux.
2011-03-15 18:12:43 +00:00
35b61cdd44
Pull from jenn_linden/viewer-vs2010
2011-03-14 22:52:11 -07:00
e25c56dd67
update zlib archive for linux.
2011-03-14 23:25:23 +00:00
f1f57ed5ac
update xmlrpc-epi archive for linux.
2011-03-14 23:03:41 +00:00
17343b76df
update openssl archive for linux.
2011-03-14 22:43:09 +00:00
72d1febadb
update openjpeg archive for linux.
2011-03-14 21:18:24 +00:00
ec0c28ad83
update ogg-vorbis archive for linux.
2011-03-14 20:24:55 +00:00
c41d9949d7
update llqtwebkit usage.
2011-03-14 20:01:31 +00:00
fcdd82af83
update libpng archive for linux.
2011-03-11 23:50:00 +00:00
5b87c94fa7
update kdu archive for linux.
2011-03-11 23:39:38 +00:00
9603d73f1f
update jpeglib archive for linux.
2011-03-11 19:32:18 +00:00
8c310339e2
update google_breakpad archive for linux.
2011-03-11 01:39:18 +00:00
44543756d8
update freetype archive for linux.
2011-03-11 00:35:10 +00:00
353c54d668
update fontconfig archive for linux.
2011-03-11 00:27:44 +00:00
2ed71097ab
fmod archive updated for linux.
2011-03-11 00:16:23 +00:00
f3c54b503a
update expat archive for linux.
2011-03-10 22:55:22 +00:00
4a8e5d9df9
update dbusglib archive for linux.
2011-03-10 21:51:13 +00:00
33fbb63227
update curl archive for linux.
2011-03-10 19:05:10 +00:00
acec15e723
update boost archive usage for linux.
2011-03-10 17:53:15 +00:00
871677dc0b
ares archive updated for linux.
2011-03-10 01:31:40 +00:00
8dee1ed4c7
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-03-10 00:48:36 +00:00
4947062236
update apr and sdl archives for linux; added new archive db (needed for linux only).
2011-03-10 00:48:20 +00:00
fb86600a33
update glui archive for darwin.
2011-03-09 09:26:12 -08:00
eddf24a00f
update ndofdev archive usage on darwin.
2011-03-09 08:58:52 -08:00
49698a49de
update llqtwebkit usage on darwin.
2011-03-08 14:14:57 -08:00
b1a71cbcd2
update fmod and kdu archive usage for mac.
2011-03-08 11:02:10 -08:00
a60bf285b8
really update google_breakpad archive usage for darwin.
2011-03-08 09:18:44 -08:00
e1de26e097
merge fix to linux google_breakpad archive.
2011-03-07 16:36:00 -08:00
3ebe0dd12b
Backed out changeset 7f3922c6bbc4 -- updated linux by mistake.
2011-03-07 16:35:08 -08:00
1f4630a967
updating zlib archive for darwin.
2011-03-07 16:18:09 -08:00
d107e4b0a7
update xmlrpc-epi archive for darwin.
2011-03-07 16:08:56 -08:00
64293a808c
update pth archive usage for darwin.
2011-03-07 15:21:47 -08:00
e77de93529
update openjpeg archive usage for darwin.
2011-03-07 15:09:15 -08:00
d9715317b1
update openSSL archive usage for darwin.
2011-03-07 14:54:50 -08:00
12c2fd2ef0
update ogg-vorbis archive usage for darwin.
2011-03-07 14:23:09 -08:00
33927b8451
update libpng and jpeglib archives for mac.
2011-03-07 11:44:51 -08:00
7587b1b3bb
update mac google_breakpad archive.
2011-03-07 10:43:18 -08:00
006674447a
update darwin freetype archive.
2011-03-07 09:50:05 -08:00
7285dd9e42
ares, boost, expat, freetype archives updated to latest builds.
2011-03-04 14:49:20 -08:00
c20eb01ff2
pull up changes from viewer-autobuild
2011-03-03 21:18:15 -05:00
fb8a2aa572
imported patch mac_archives
2011-03-03 16:51:21 -08:00
58e5c8476d
update to use new GL archive (includes only headers; that's all that is needed)
2011-03-03 16:15:08 -08:00
9bd9a55608
hacky addition of VSTool postprocessing to set startup project and default configuration.
2011-03-03 14:42:48 -08:00
149ace0b1f
Autobuild : points to the corrected pth package for Mac
2011-03-03 11:28:06 -08:00
856a6992eb
pull latest changes from viewer-vs2010
2011-03-03 07:50:40 -05:00
b7c49f0f47
merge up from viewer-development and viewer-autobuild
2011-03-03 07:20:54 -05:00
fa20a6de08
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-03-02 15:07:04 -08:00
f680c91a09
update openjpeg package usage for windows.
2011-03-02 14:50:49 -08:00
99ba5e2670
revert to old jsoncpp library on linux to fix build.
2011-03-02 21:28:26 +00:00
49f5a3ec7d
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-03-02 17:50:05 +00:00
899d0d6282
update to jsoncpp built with gcc4.1
2011-03-02 17:49:59 +00:00
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
7093503e26
Attempting to configure VS2010 to only use one processor core to troubleshoot conflict with TC.
2011-03-01 19:54:17 -08:00
88f507f9cc
fixes to get openal working on windows.
2011-03-01 15:32:35 -08:00
7f00a037ee
update to TeamCity build from https://bitbucket.org/lindenlab/3p-elfio
2011-02-25 12:36:17 -05:00
781bd2ce19
sync to latest viewer-development and viewer-autobuild
2011-02-24 22:31:35 -05:00
ed73c8bf63
pull latest changes from viewer-vs2010
2011-02-24 22:27:08 -05:00
2e74612778
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-24 22:23:13 -05:00
b1787a19d3
change to canonical build of the pth lib
2011-02-24 21:40:18 -05:00
7aca14a77a
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-24 16:07:20 -08:00
713933fa76
Merged changes from bitbucket.org/squire_linden/viewer-vs2010
2011-02-24 15:59:52 -08:00
2c27d43228
update to fixed debug google-mock archive.
2011-02-24 15:43:50 -08:00
d8944cfef3
Windows uses updated fmod archive and vs2010 compiled kdu archive.
2011-02-24 14:07:03 -08:00
1db3f3b5ce
integrate xmlrpc-epi into windows build.
2011-02-24 12:27:58 -08:00
f939b95d0c
update windows to use new libndofdev and google-mock archives.
2011-02-23 15:50:03 -08:00
62feb3b4bc
windows uses updated ogg-vorbis archive.
2011-02-22 14:54:28 -08:00
50a4cb1dfc
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-22 10:50:31 -08:00
0130a0801e
update google_breakpad archive usage on windows.
2011-02-22 10:49:32 -08:00
531de7491b
Changes windows build and PNG cmake to reflect latests libpng builds
2011-02-21 18:57:54 -08:00
415b3ca1da
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-23 06:47:57 -05:00
ece9940bff
Pull in FreeType 2.4.4 for Windows (built using AutoBuild)
2011-02-19 09:33:49 -08:00
7b9d54379f
use improved packaging for jsoncpp
2011-02-18 21:29:25 -05:00
69855f9d34
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-18 16:07:58 -08:00
efc572339d
remove installable mesa for windows; not used.
2011-02-18 16:06:56 -08:00
14e09f9f79
Pull in autobuild derrived jpeglib (version 8c) for Windows MSVC 2010
2011-02-18 13:33:58 -08:00
c89e281de1
merge changes from jenn_linden/viewer-vs2010
2011-02-17 21:01:23 -05:00
2ab9ba026e
update to latest apr_suite package.
2011-02-17 17:49:03 -08:00
75f7aca107
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-16 18:24:03 -05:00
8af932de1f
use new packages.
2011-02-16 14:06:50 -08:00
18a49e58ea
update curl and dependent installed archies to vs2010 builds.
2011-02-11 15:18:11 -08:00
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
9251d95205
OPEN-1: (partial) use environment when building with Visual Studio Express
2011-02-10 14:41:00 -05:00
c2bfa25299
update pacageing of msvc?100.dll's; use latest qt package with all needed libs.
2011-02-07 16:46:18 -08:00
ceeffc6c92
use up to date openssl package.
2011-02-07 12:56:58 -08:00
ed4661b607
update packages.
2011-02-07 10:00:33 -08:00
eb68b5fa0a
OPEN-1 WORKAROUND correct build arguments again for VS Express
2011-02-06 10:37:42 -05:00
0c6de5c6cc
OPEN-1 WORKAROUND correct build arguments for VS Express
2011-02-06 10:09:58 -05:00
82d9e1b73e
OPEN-1 WORKAROUND revert change to cmake string for VS 8
2011-02-06 09:56:09 -05:00
7e19ef5b4f
OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling with VS Express
2011-02-06 08:50:06 -05:00
cbffa57351
fix linking to llqtwebkit.
2011-02-04 12:52:36 -08:00
3f78394f42
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
2011-01-31 15:56:40 -08:00
48bf6b19b3
build uses latest jsoncpp package with new layout.
2011-01-31 15:55:42 -08:00
8adcaa147d
update mac and linux json libs.
2011-01-31 15:19:49 -08:00
f05f2412b2
patches to use new jsoncpp lib on windows
2011-01-31 12:31:36 -08:00
3895be8e25
update to use patched quicktime package
2011-01-27 17:16:27 -08:00
287143080b
use patched llqtwebkit library on windows.
2011-01-27 14:57:20 -08:00
5833672c5c
fix quoting of vs8 generator string.
2011-01-26 16:09:40 -08:00
216c3b4771
adding OpenSource* and OpenSourceStandAlone* configurations.
2011-01-26 15:57:48 -08:00
ed8aef42e1
windows uses llqtwebkit now published on s3.
2011-01-26 09:07:20 -08:00
c2d1f9215a
Merge in changes from mani_linden/viewer-vs2010
2011-01-25 10:36:14 -08:00
6dd086794f
Updated boost lib
2011-01-24 12:04:49 -08:00
a7c7d09c16
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
2011-01-20 17:13:08 -08:00
00c9123919
add license information derived from istall.xml
2011-01-20 16:59:33 -08:00
67fdd528fd
update mac and linux curl packages to use expected lib layout.
2011-01-20 16:17:15 -08:00
e421ffa3a7
update linux slvoice pacakge.
2011-01-20 15:16:02 -08:00
e59a2f94c7
update slvoice package.
2011-01-20 15:06:53 -08:00
ea8c2b1fa1
update curl lib to fixed archive.
2011-01-20 14:32:03 -08:00
785d3ce425
update slvoice library on mac.
2011-01-20 14:15:09 -08:00
3cae4f41a0
update curl library used.
2011-01-20 11:25:16 -08:00
f6197abb09
Updated google_breakpad package on linux in autobuild.xml. Previously omitted a necessary include file.
2011-01-19 16:21:10 -08:00
0a9d62f54b
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
2011-01-19 14:16:39 -08:00
00f8de0666
Update 'kdu' for linux in autobuild.xml. Old version had deprectated package structure.
2011-01-19 14:14:40 -08:00
7f5c6f34f2
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
2011-01-19 12:12:07 -08:00
a339c948b5
update google-breakpad package; fix call to dump symbols.
2011-01-19 12:11:54 -08:00
c4713b4f9f
Added 'kdu' to autobuild.xml for linux.
2011-01-18 17:18:29 -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
f38c18bb3d
reduce mac log spam.
2011-01-18 13:28:53 -08:00
c89cc27f1a
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
2011-01-18 10:44:48 -08:00
bae82a240c
use platform specific build commands.
2011-01-18 10:44:27 -08:00
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
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
5d3e7c8e7e
add licence file information
2011-01-12 11:56:25 -08:00
35c259b603
first pass at packages that need to be installed through autobuild.
2011-01-12 09:28:21 -08:00
fabcf9c8e0
autobuild configuration to build the viewer (dependencies still handled by install.py)
2011-01-11 15:59:22 -08:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
Xiaohong Bao