diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-23 16:46:08 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-23 16:46:08 -0400 |
| commit | f73a0c2e1343d99648a0ad3658e616704d36c3be (patch) | |
| tree | 7b6475dfb83a6b9d00cf3239c0280f0c83a20e7a /indra/newview | |
| parent | ec88d21c561cd80415f6e47812dd4c3c4bd0b088 (diff) | |
| parent | 1ac289bac95db85c90058ed333ff8cb261d93c6f (diff) | |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 0f2d461511..e42f9d64c2 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1676,6 +1676,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} ${LLCONVEXDECOMP_LIBRARY} + ${TCMALLOC_LIBRARIES} ) build_version(viewer) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d6b865c249..8383cc33ab 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -939,6 +939,8 @@ class Linux_i686Manifest(LinuxManifest): self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname + self.path("libtcmalloc_minimal.so", "libtcmalloc_minimal.so") #formerly called google perf tools + self.path("libtcmalloc_minimal.so.0", "libtcmalloc_minimal.so.0") #formerly called google perf tools try: self.path("libkdu.so") pass |