From 7e7308c8da7d6c892841f2a8cb7414e208576a2e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 17 Oct 2008 20:41:43 -0500 Subject: Commented out fmod from viewer manifest. --- ChangeLog.txt | 3 +++ linden/indra/newview/viewer_manifest.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index da20546..b66f4b7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,8 @@ 2008-10-17 Jacek Antonelli + * linden/indra/newview/viewer_manifest.py: + Commented out fmod from viewer manifest. + * Updated to SL source 1.21.6. diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 3d56c7d..c9a5812 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -167,7 +167,7 @@ class WindowsManifest(ViewerManifest): self.path("dbghelp.dll") # For using FMOD for sound... DJS - self.path("fmod.dll") + #self.path("fmod.dll") # For textures if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): @@ -413,7 +413,7 @@ class DarwinManifest(ViewerManifest): # self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib") #libfmodwrapper.dylib - self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") + #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") # our apps # self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app") @@ -613,7 +613,7 @@ class Linux_i686Manifest(LinuxManifest): if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): # self.path("libkdu_v42R.so") - self.path("libfmod-3.75.so") +# self.path("libfmod-3.75.so") self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") self.path("libdb-4.2.so") -- cgit v1.1