56ca1aebb8
remove linux linking stats from build process - I added them to help optimize linking time, but they're noisy and inaccurate in reality.
2010-02-04 11:40:33 +00:00
9430b8de65
dos2unix these files
2010-02-01 16:29:52 -08:00
1500e90ecc
Make sure mac build honors compile-time flag that en/disables OS drag and drop.
...
Also fixed the cmake file to properly set LL_OS_DRAGDROP_ENABLED.
2010-01-08 15:11:03 -08:00
4d55b5bad0
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-12-18 14:25:15 -08:00
bff2f1d6f0
EXT-3140 and build performance enhancements.
...
Move the message_template check and manifest checking to the package step.
Moved the dll copy from a post-build step its own target for dependency checking.
Disabled copy of art/xui, etc in viewer manifest for non-package builds.
2009-12-15 14:19:33 -08:00
4a92f49e7b
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 09:28:47 -08:00
25a773d79c
DEV-43896 solve render-pipeline linux mesh gzopen64 problem
...
I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.
2009-12-08 11:39:44 -08:00
432bf69ad6
DEV-43897 linux viewer2 corrupted vorbis problem
...
we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
2009-12-08 08:56:13 +00:00
0a2a52c3b1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 11:55:43 -08:00
aae1917d2e
merge
2009-11-30 09:25:39 -08:00
dd6cfa8f98
Uncomment the run_build_test.py args to debug problem with coverity builds
2009-11-25 16:59:11 -08:00
0b9aa79570
merge
2009-11-23 17:20:08 -08:00
dd3c7a1a25
Fix for errors with integration tests failing to find libcrypto.so.0.9.7
2009-11-20 15:35:19 -05:00
0627d550f3
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/
2009-11-19 09:29:08 -08:00
9e53ad6111
Doh! Update the CMake file that controls drag and drop to turn it ON
2009-11-18 21:17:39 -08:00
4419e367bc
Add support for removing the Windows specific drag/drop code
...
from the codebase via a new CMake file (DragDrop.cmake).
2009-11-18 21:15:44 -08:00
699eac4ee3
Switch some files to Unix line endings
2009-11-18 17:52:03 -08:00
8b56d0bece
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-18 12:02:04 -08:00
6b81dfb139
Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory manager
...
Reviewed by Bao
2009-11-18 11:59:09 -08:00
67f11add9c
Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled pch usage for test executables. Reviewed by james and steve.
2009-11-13 20:30:54 -05:00
36ec149bef
Removed libtcmalloc_minimal.dll from the default build.
...
Reviewed by Palmer
2009-12-02 16:00:22 -08:00
5e11affddb
merge
2009-12-01 08:51:32 -08:00
ac8a710532
Merge the major new voice SDK version from Vivox ('mossbuild1')
2009-12-01 16:40:43 +00:00
dcc617fcf5
Made the gcc version number checking more robust in llaudio's
...
CMakeFiles.txt file. Previously it checked for a narrow range of gcc
versions via a regex:
if (${CXX_VERSION} MATCHES "4.[23]")
Now we explicit check for any version >= 4.2:
if (${CXX_VERSION_NUMBER} GREATER 419)
2009-11-30 18:42:45 +00:00
3858992603
Add CMake var LL_TESTS to optionally disable tests for build timing
2009-11-27 22:24:57 -08:00
1942e607f8
merge.
2009-11-26 09:47:00 +00:00
de92d5ce32
re-upgrade to vivox v3 sdk here.
2009-11-23 17:57:25 +00:00
59eb2815bf
merge
...
--HG--
branch : avatar-pipeline
2009-11-13 18:28:27 -05:00
b34ee7f9f4
merge
2009-11-11 12:21:23 -08:00
fedf86c216
fix wrapping of text segment containing multiple newlines and ending on a newline
...
reviewed by leyla
2009-11-11 12:01:57 -08:00
d57c20787a
Fix for mac failure in apr shared lib staging (Part of DEV-41724)
2009-11-10 14:04:05 -05:00
115dd2b09c
Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0.
2009-11-09 20:08:30 -05:00
b7d5114634
Fix for DEV-41797 - "LL_QUICKTIME_ENABLED is often unset on Windows builds"
2009-11-09 15:49:15 -08:00
06ba4927aa
Changed copy of libuuid.so to libuuid.so.1
2009-11-06 17:19:47 -08:00
9317e46a87
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
2009-11-06 12:54:33 -08:00
05baf9940b
merge
2009-11-06 10:53:51 -08:00
dbd749d533
DEV-42322 webkit plugin fails to start on linux in mercurial repo
2009-11-06 17:57:15 +00:00
ec32310c86
Removed search_dirs and dst_path arguments from ll_deploy_sharedlibs_command()
...
Fixed mac breakage.
2009-11-05 17:51:50 -08:00
953b7ea550
Belated addition of GetPrerequisites_2_8.cmake
2009-11-05 16:00:47 -08:00
4bcff13194
merge
2009-11-05 09:21:21 -08:00
797b4e22b3
Merge of my DEV-41724/DEV-41725 work with viewer-2-0
...
normalizing shared library staging on all 3 platforms. Test executables should
now run in the debugger.
2009-11-05 12:07:10 -05:00
9e69702fe7
Added calls to ll_deploy_sharedlibs_command
...
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-11-05 08:52:07 -08:00
4bff7b0853
Wrap-up work for DEV-41724/DEV-41725 - normalizing shared library staging on all 3 platforms.
...
Should now work out of the box on all 3 platforms and in the debugger.
2009-11-04 18:50:35 -05:00
f9c4682fb3
Continuing work on DEV-41724/DEV-41725 normalizing shared lib staging.
...
It's basically working on linux.
2009-11-03 18:35:36 -05:00
e87975284e
update from viewer2 and merge into avp
...
--HG--
branch : avatar-pipeline
2009-11-03 14:52:05 -05:00
0dd9871012
merge
...
--HG--
branch : avatar-pipeline
2009-11-03 14:02:02 -05:00
2a79326ff6
Removed tabs. Fixed errant 'else(APPLE)'
2009-11-02 14:23:40 -08:00
589d64fda7
Merging my DEV-41722 work with viewer-2-0
2009-11-02 16:59:32 -05:00
90ea3d3b35
Implemented linux staging for DEV-41722 normalizing shared lib staging.
2009-11-02 16:53:50 -05:00
f891ca654d
Automated merge with http://hg.lindenlab.com/viewer/viewer-2-0
2009-11-02 12:13:14 -08:00
Tofu Linden