diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-07 15:11:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-07 15:11:55 -0400 |
| commit | 545e033d1e008f4b1da330d6967b363c7d09feca (patch) | |
| tree | 73e1a622a224b81bce076d38a8c4140e43c8deb9 /indra/newview | |
| parent | f382233fbb29bf81fc4009930dc134253d8ea250 (diff) | |
| parent | 0f3d291ef61deeb015dec332cf19822b63be2402 (diff) | |
merge changes for DRTVWR-299
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llviewerprecompiledheaders.h | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 379fa6147b..6e0bb161af 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1862,6 +1862,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${viewer_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} + ${BOOST_CONTEXT_LIBRARY} ${DBUSGLIB_LIBRARIES} ${OPENGL_LIBRARIES} ${FMODWRAPPER_LIBRARY} # must come after LLAudio diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h index 0316f79973..a565005f30 100755 --- a/indra/newview/llviewerprecompiledheaders.h +++ b/indra/newview/llviewerprecompiledheaders.h @@ -33,8 +33,6 @@ // in viewer. // It is used to precompile headers for improved build speed. -#include <boost/coroutine/coroutine.hpp> - #include "linden_common.h" // Work around stupid Microsoft STL warning diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c7034d4156..bc473f6d62 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1033,12 +1033,13 @@ class Linux_i686Manifest(LinuxManifest): self.path("libaprutil-1.so") self.path("libaprutil-1.so.0") self.path("libaprutil-1.so.0.4.1") + self.path("libboost_context-mt.so.*") + self.path("libboost_filesystem-mt.so.*") self.path("libboost_program_options-mt.so.*") self.path("libboost_regex-mt.so.*") - self.path("libboost_thread-mt.so.*") - self.path("libboost_filesystem-mt.so.*") self.path("libboost_signals-mt.so.*") self.path("libboost_system-mt.so.*") + self.path("libboost_thread-mt.so.*") self.path("libbreakpad_client.so.0.0.0") self.path("libbreakpad_client.so.0") self.path("libbreakpad_client.so") |