From d1ad7a56beee603b336600d4aace1e4d4c0f5ade Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Sat, 2 Oct 2010 18:30:52 -0700 Subject: STORM-137 : Build script modif so that Windows build does not rely on fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly. --- indra/newview/viewer_manifest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 indra/newview/viewer_manifest.py (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py old mode 100644 new mode 100755 index 949fa3cc1c..26adc78459 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -259,6 +259,12 @@ class WindowsManifest(ViewerManifest): except RuntimeError: print "Skipping llkdu.dll" + # Get fmod dll, continue if missing + try: + self.path("fmod.dll") + except: + print "Skipping fmod.dll" + # Get llcommon and deps. If missing assume static linkage and continue. try: self.path('llcommon.dll') @@ -315,12 +321,6 @@ class WindowsManifest(ViewerManifest): # For use in crash reporting (generates minidumps) self.path("dbghelp.dll") - try: - # FMOD for sound - self.path("fmod.dll") - except: - print "Skipping FMOD - not found" - self.enable_no_crt_manifest_check() # Media plugins - QuickTime -- cgit v1.2.3 From 023644b4bcd41519f21cc350139d97e78254872c Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 8 Oct 2010 15:31:40 -0700 Subject: STORM-137: Fix windows packaging issue, namely, do not require a manifest to move the fmod.dll --- indra/newview/viewer_manifest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 26adc78459..84dd37ead3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -259,12 +259,6 @@ class WindowsManifest(ViewerManifest): except RuntimeError: print "Skipping llkdu.dll" - # Get fmod dll, continue if missing - try: - self.path("fmod.dll") - except: - print "Skipping fmod.dll" - # Get llcommon and deps. If missing assume static linkage and continue. try: self.path('llcommon.dll') @@ -277,6 +271,12 @@ class WindowsManifest(ViewerManifest): self.disable_manifest_check() + # Get fmod dll, continue if missing + try: + self.path("fmod.dll") + except: + print "Skipping fmod.dll" + # For textures if self.args['configuration'].lower() == 'debug': self.path("openjpegd.dll") -- cgit v1.2.3