aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py12
1 files changed, 9 insertions, 3 deletions
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):
181 def final_exe(self): 181 def final_exe(self):
182 if self.default_channel(): 182 if self.default_channel():
183 if self.default_grid(): 183 if self.default_grid():
184 return "Imprudence.exe" 184 return "imprudence.exe"
185 else: 185 else:
186 return "ImprudencePreview.exe" 186 return "imprudencepreview.exe"
187 else: 187 else:
188 return ''.join(self.channel().split()) + '.exe' 188 return ''.join(self.channel().split()) + '.exe'
189 189
@@ -214,6 +214,12 @@ class WindowsManifest(ViewerManifest):
214 self.path("openjpeg.dll") 214 self.path("openjpeg.dll")
215 self.end_prefix() 215 self.end_prefix()
216 216
217 # For sound
218 if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
219 self.path("openal32.dll")
220 self.path("alut.dll")
221 self.end_prefix()
222
217 # Mozilla appears to force a dependency on these files so we need to ship it (CP) 223 # Mozilla appears to force a dependency on these files so we need to ship it (CP)
218 self.path("msvcr71.dll") 224 self.path("msvcr71.dll")
219 self.path("msvcp71.dll") 225 self.path("msvcp71.dll")
@@ -247,7 +253,7 @@ class WindowsManifest(ViewerManifest):
247 253
248 # Vivox runtimes 254 # Vivox runtimes
249 if self.prefix(src="vivox-runtime/i686-win32", dst=""): 255 if self.prefix(src="vivox-runtime/i686-win32", dst=""):
250 self.path("alut.dll") 256 # self.path("alut.dll")
251 self.path("wrap_oal.dll") 257 self.path("wrap_oal.dll")
252 258
253 # self.path("SLVoice.exe") 259 # self.path("SLVoice.exe")