Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link boost dynamically, bundle its libs. Addresses issue 1152.

Browse Source 
Rebuild collada to also use dynamic boost.
SV-1152 #close Fixed by linking boost dynamically
This commit is contained in:
Latif Khalifa
2013-12-20 03:02:17 +01:00
parent 2bb2e05ef9
commit 85c875e856
3 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/cmake/Boost.cmake
View File

@@ -38,26 +38,26 @@ else (STANDALONE)
debug libboost_thread-mt-gd)
elseif (LINUX)
set(Boost_CONTEXT_LIBRARY
optimized boost_context-mt.a
debug boost_context-mt-d.a)
optimized boost_context-mt
debug boost_context-mt-d)
set(Boost_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt.a
debug boost_filesystem-mt-d.a)
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(Boost_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt.a
debug boost_program_options-mt-d.a)
optimized boost_program_options-mt
debug boost_program_options-mt-d)
set(Boost_REGEX_LIBRARY
optimized boost_regex-mt.a
debug boost_regex-mt-d.a)
optimized boost_regex-mt
debug boost_regex-mt-d)
set(Boost_SIGNALS_LIBRARY
optimized boost_signals-mt.a
debug boost_signals-mt-d.a)
optimized boost_signals-mt
debug boost_signals-mt-d)
set(Boost_SYSTEM_LIBRARY
optimized boost_system-mt.a
debug boost_system-mt-d.a)
optimized boost_system-mt
debug boost_system-mt-d)
set(Boost_THREAD_LIBRARY
optimized boost_thread-mt.a
debug boost_thread-mt-d.a)
optimized boost_thread-mt
debug boost_thread-mt-d)
elseif (DARWIN)
set(Boost_CONTEXT_LIBRARY
optimized boost_context-mt

18
indra/newview/viewer_manifest.py
View File

@@ -827,6 +827,15 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libtcmalloc_minimal.so.0")
self.path("libtcmalloc_minimal.so.0.2.2")
# Boost
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_signals-mt.so.*")
self.path("libboost_system-mt.so.*")
self.path("libboost_thread-mt.so.*")
if 'extra_libraries' in self.args:
path_list = self.args['extra_libraries'].split('|')
for path in path_list:
@@ -870,6 +879,15 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libpng*.so*")
self.path("libz.so*")
# Boost
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_signals-mt.so.*")
self.path("libboost_system-mt.so.*")
self.path("libboost_thread-mt.so.*")
# OpenAL
self.path("libopenal.so*")
self.path("libalut.so*")

8
install.xml
View File

@@ -256,16 +256,16 @@
<key>linux</key>
<map>
<key>md5sum</key>
<string>8817faad001cea8f92546f30b5fcbbfa</string>
<string>8a1017e1935ae3c88dea7f4552573f53</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux-20131007.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux-20131219.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>1d23d74f2f475945ec4d24f70a27561d</string>
<string>446dbefb0d3dd0bd93f30b4ef1eaa67b</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux64-20131007.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux64-20131219.tar.bz2</uri>
</map>
<key>windows</key>
<map>