diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-02 18:30:52 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-02 18:30:52 -0700 |
| commit | d1ad7a56beee603b336600d4aace1e4d4c0f5ade (patch) | |
| tree | 9bf26b89d321a1e851ece6fd4124947aae7ba8db /indra/newview/viewer_manifest.py | |
| parent | b906a7a76aea1d06829237be3cb5336961f7dfce (diff) | |
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.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/viewer_manifest.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 949fa3cc1c..26adc78459 100644..100755 --- 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 |