Added openal32.dll and alut.dll to CopyWinLibs.cmake

2 files changed, 15 insertions, 8 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 0534ce6..3d70c8f 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -14,7 +14,6 @@ set(vivox_files
     ssleay32.dll
     SLVoiceAgent.exe
     srtp.dll
-    alut.dll
     vivoxsdk.dll
     ortp.dll
     wrap_oal.dll
@@ -22,12 +21,15 @@ set(vivox_files
 
 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(debug_files
+    alut.dll
     freebl3.dll
     gksvggdiplus.dll
     js3250.dll
     nspr4.dll
     nss3.dll
     nssckbi.dll
+    openal32.dll
+    openjpegd.dll
     plc4.dll
     plds4.dll
     smime3.dll
@@ -35,9 +37,7 @@ set(debug_files
     ssl3.dll
     xpcom.dll
     xul.dll
-    openjpegd.dll
     windbgdlg.exe
-    openal32.dll
     )
 
 copy_if_different(
@@ -58,12 +58,15 @@ set(all_targets ${all_targets} ${out_targets})
 
 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
+    alut.dll
     freebl3.dll
     gksvggdiplus.dll
     js3250.dll
     nspr4.dll
     nss3.dll
     nssckbi.dll
+    openal32.dll
+    openjpeg.dll
     plc4.dll
     plds4.dll
     smime3.dll
@@ -71,8 +74,6 @@ set(release_files
     ssl3.dll
     xpcom.dll
     xul.dll
-    openjpeg.dll
-    openal32.dll
     )
     
 copy_if_different(
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index d08fd8a..d8261c2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -181,9 +181,9 @@ class WindowsManifest(ViewerManifest):
     def final_exe(self):
         if self.default_channel():
             if self.default_grid():
-                return "Imprudence.exe"
+                return "imprudence.exe"
             else:
-                return "ImprudencePreview.exe"
+                return "imprudencepreview.exe"
         else:
             return ''.join(self.channel().split()) + '.exe'
 
@@ -214,6 +214,12 @@ class WindowsManifest(ViewerManifest):
             self.path("openjpeg.dll")
             self.end_prefix()
 
+        # For sound
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("openal32.dll")
+            self.path("alut.dll")
+            self.end_prefix()           
+
         # Mozilla appears to force a dependency on these files so we need to ship it (CP)
         self.path("msvcr71.dll")
         self.path("msvcp71.dll")
@@ -247,7 +253,7 @@ class WindowsManifest(ViewerManifest):
 
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
-            self.path("alut.dll")
+        #    self.path("alut.dll")
             self.path("wrap_oal.dll")
 
         #    self.path("SLVoice.exe")