b530648dd4
EXP-869 FIX -- Mac viewer should build without requiring settings modifications
...
Modified cmake GCC_VERSION from 4.2 to 4.0, our officially supported GCC version
Reviewed by Richard
2011-06-01 11:46:53 -07:00
2414417210
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-18 15:33:17 -04:00
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
2661a4c2c9
Merge.
2011-05-09 11:26:24 -07:00
4888db6f9c
Continuing work on CHOP-609 build time improvements. Fixed eroneous additional_INCLUDE_DIRS setting for unit tests.
2011-05-06 14:51:50 -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
62b1791d7a
Merged latest lindenlab/viewer-development with brad_linden/viewer-mustbuildfaster-0.
2011-05-05 15:39:18 -07:00
ebda8f883b
Work in progress on CHOP-609. Added checking in indra/cmake/Prebuilt.cmake to skip unnecessary unpacking of already installed packages.
2011-05-04 16:07:27 -07:00
0ca94ddec2
merge changes for open-61
2011-05-04 19:02:06 -04:00
e9b454f5f9
Slightly improve sanity of run_build_test.py output.
...
Flushing print buffer before running actual test executable should make it
clearer which setup actions apply to which test run.
2011-05-04 10:49:45 -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
a25f898703
merge
2011-05-02 14:52:12 -05:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
0656620e2d
merge changes for storm-1187
2011-04-22 11:49:41 -04:00
62208046ae
merge
2011-04-21 16:37:03 -05:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
4906f4644f
OPEN-61 Adding locations that redistributable package installs msvc* files.
2011-04-21 22:11:48 +01:00
d9c7c925da
adding collada and minizip to the libraries we package the viewer with for mac.
2011-04-20 22:35:06 -06: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
3cb97cb4d7
restoring glod to copy3rdpartylibs.cmake and viewer_manifest.py
2011-04-18 18:48:43 -04:00
8d2943c5dd
Fixed debug information format for mac to allow breakpoints to work under Xcode.
2011-04-18 14:08:29 -07:00
ea2d89880f
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
2011-04-18 17:03:51 -04:00
130db30b26
adding collada and minizip to the libraries we package the viewer with.
2011-04-18 17:03:46 -04:00
e968760014
more fix for the libminizip issue for linux.
2011-04-18 14:09:58 -06:00
f92d521b46
fixed windows boost library names
2011-04-14 11:08:50 -04:00
0e2df02775
Attempt at making tcmalloc work.
2011-04-11 15:42:17 -05:00
5f872761ca
no longer using tcmalloc-minimal, replacing cmake config to refer to
...
full build version.
2011-04-08 20:03:44 -04:00
d490081fe2
changes for newer collada build
2011-04-08 17:12:26 -04:00
e4819d9b22
Trying to fix missing python exe problem
2011-04-06 18:20:18 -04:00
82572bd3a9
merge
2011-04-06 15:54:51 -04:00
3e5961d183
Updated llconvexdecomposition library build
2011-04-06 15:54:27 -04: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
8f0d59cab3
OPEN-50 (partial): refactor cmake switches to common configurations and default values
2011-04-06 05:46:45 -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
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
b8e97adced
merge changes for OPEN-39
2011-04-03 09:37:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
44ad672b9e
Apply server side code to message template verification onto the viewer tree.
2011-03-31 15:43:47 -07:00
0080ed8e29
Merge
2011-03-31 14:07:54 -07:00
926e506d0a
d'oh, forgot to add back some q libs to the build when reverting to older linux package; here they are.
2011-03-31 16:17:12 +00:00
2f190297f0
remove lib requirement not in current llqtwebkit linux archive.
2011-03-30 20:12:37 +00:00
616b0a2568
Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545).
2011-03-23 10:44:39 -07:00
abc259618f
merged OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 22:43:33 +01:00
6ec5177667
OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 21:07:09 +01:00
8468670583
Autobuild : Fix merge snaffu in Json cmake file
2011-03-18 16:47:43 -07:00
bfeaae9ea7
STORM-1023, STORM-1022 : pull into viewer-autobuild2010
2011-03-18 15:39:31 -07:00
e13f5884aa
Autobuild: pull in from jenn_linden/viewer-vs2010
2011-03-18 15:33:14 -07:00
dd8c9eb98a
Removal of dbghelp cruft.
...
Reviewed by alain and nat.
2011-03-18 12:24:04 -04:00
Leslie Linden