linux64: fetch 32 bit libraries required for voice

2 files changed, 13 insertions, 10 deletions

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7bd306b..4a62ebd 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,6 +4,9 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
+   if(LINUX64)
+     use_prebuilt_binary(32bitcompatibilitylibs)
+   endif(LINUX64)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
 
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 88ef0ad..d34e9ae 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1006,7 +1006,6 @@ class Linux_i686Manifest(LinuxManifest):
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib")
 
-
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):
         super(Linux_x86_64Manifest, self).construct()
@@ -1123,14 +1122,6 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.end_prefix("gstreamer-plugins")
             self.end_prefix("lib64")
         
-#       if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
-#            self.path("libalut.so")
-#           self.path("libidn.so.11")
-#           self.path("libopenal.so.1")
-#           self.path("libortp.so")
-#           self.path("libuuid.so.1")
-#        self.end_prefix("lib32")
-
 
             # Vivox runtimes and libs
             if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
@@ -1138,10 +1129,19 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.end_prefix("bin")
 
             if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
-                self.path("libalut.so")
+                #self.path("libalut.so")
                 self.path("libortp.so")
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib32")
+                
+            # 32bit libs needed for voice
+            if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
+                self.path("libalut.so")
+                self.path("libidn.so.11")
+                self.path("libopenal.so.1")
+                # self.path("libortp.so")
+                self.path("libuuid.so.1")
+            self.end_prefix("lib32")
 
 if __name__ == "__main__":
     main()