diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-19 14:42:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-19 14:42:56 -0400 |
| commit | 3bb708d70636188b91a6e8476a3b899441de0468 (patch) | |
| tree | 85790d906bed73e19138004c4a54fc3fed952d85 /indra/newview/viewer_manifest.py | |
| parent | 327c99cadbcbe15442eaee8e0625ade17dcda61f (diff) | |
| parent | ddd5659f815a39e9a8ef0e86c911fea75a7d8848 (diff) | |
merge up to latest viewer-development for merge to 3.5.2
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/viewer_manifest.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 26c1e62522..c7034d4156 100644..100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -336,10 +336,14 @@ class WindowsManifest(ViewerManifest): print err.message print "Skipping COLLADA and GLOD libraries (assumming linked statically)" - - # Get fmod dll, continue if missing - if not self.path("fmod.dll"): - print "Skipping fmod.dll" + # Get fmodex dll, continue if missing + try: + if self.args['configuration'].lower() == 'debug': + self.path("fmodexL.dll") + else: + self.path("fmodex.dll") + except: + print "Skipping fmodex audio library(assuming other audio engine)" # For textures if self.args['configuration'].lower() == 'debug': @@ -712,6 +716,7 @@ class DarwinManifest(ViewerManifest): "libcollada14dom.dylib", "libexpat.1.5.2.dylib", "libexception_handler.dylib", + "libfmodex.dylib", "libGLOD.dylib", ): dylibs += path_optional(os.path.join(libdir, libfile), libfile) @@ -726,11 +731,7 @@ class DarwinManifest(ViewerManifest): 'SLVoice', ): self.path2basename(libdir, libfile) - - # FMOD for sound - libfile = "libfmodwrapper.dylib" - path_optional(os.path.join(self.args['configuration'], libfile), libfile) - + # our apps for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"), # plugin launcher @@ -1087,11 +1088,13 @@ class Linux_i686Manifest(LinuxManifest): pass try: - self.path("libfmod-3.75.so") + self.path("libfmodex-*.so") + self.path("libfmodex.so") pass except: - print "Skipping libfmod-3.75.so - not found" + print "Skipping libfmodex.so - not found" pass + self.end_prefix("lib") # Vivox runtimes |