From b53ac25d5c9e04e8e1cabaa4fdf817248431fc72 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 17 Aug 2010 03:38:45 +0100
Subject: [PATCH] SNOW-585 (VWR-20679) FIXED Build failure when the FMOD lib is
not present.
Also added Mac version of the same fix, and corrected the warning message in the Linux version that was already there.
---
doc/contributions.txt | 1 +
indra/newview/viewer_manifest.py | 16 +++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index fd43155523..f7dada053b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -520,6 +520,7 @@ Robin Cornelius
SNOW-484
SNOW-506
SNOW-514
+ SNOW-585
VWR-2488
VWR-9557
VWR-11128
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ecca003996..9885d1aa0d 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -316,8 +316,11 @@ class WindowsManifest(ViewerManifest):
# For use in crash reporting (generates minidumps)
self.path("dbghelp.dll")
- # For using FMOD for sound... DJS
- self.path("fmod.dll")
+ try:
+ # FMOD for sound
+ self.path("fmod.dll")
+ except:
+ print "Skipping FMOD - not found"
self.enable_no_crt_manifest_check()
@@ -643,8 +646,11 @@ class DarwinManifest(ViewerManifest):
):
self.path(os.path.join(libdir, libfile), libfile)
- #libfmodwrapper.dylib
- self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+ try:
+ # FMOD for sound
+ self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+ except:
+ print "Skipping FMOD - not found"
# our apps
self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
@@ -933,7 +939,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libfmod-3.75.so")
pass
except:
- print "Skipping libkdu_v42R.so - not found"
+ print "Skipping libfmod-3.75.so - not found"
pass
self.end_prefix("lib")
--
GitLab