diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2010-04-02 17:24:44 +0300 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2010-04-02 17:24:44 +0300 |
commit | 16b22d4abe99f8b43628db9db8142d65f431b062 (patch) | |
tree | 079db718f06c6ed35267db5fe35b1dbd7f2de28f /indra/newview/viewer_manifest.py | |
parent | f4f05ad4dfc1ae47ffad0c9e2d26c4123d7f42c1 (diff) | |
parent | 7d38dd51c2a59d173bee9c04737002313f4b9dec (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 18ac10fe38..659da31007 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -397,6 +397,15 @@ class WindowsManifest(ViewerManifest): self.disable_manifest_check() + # Diamondware Runtimes + if self.prefix(src="diamondware-runtime/i686-win32", dst=""): + self.path("SLVoice_dwTVC.exe") + self.path("libcurl.dll") + self.path("libeay32.dll") + self.path("ssleay32.dll") + self.path("zlib1.dll") + self.end_prefix() + # pull in the crash logger and updater from other projects # tag:"crash-logger" here as a cue to the exporter self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], @@ -606,6 +615,9 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") + # DiamondWare runtime + self.path("diamondware-runtime/universal-darwin/SLVoice_dwTVC","SLVoice_dwTVC") + self.path("diamondware-runtime/universal-darwin/libfmodex.dylib", "libfmodex.dylib") libdir = "../../libraries/universal-darwin/lib_release" dylibs = {} @@ -901,6 +913,11 @@ class Linux_i686Manifest(LinuxManifest): pass self.end_prefix("lib") + # Diamondware runtimes + if self.prefix(src="diamondware-runtime/i686-linux", dst="bin"): + self.path("SLVoice_dwTVC") + self.end_prefix() + # Vivox runtimes if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): self.path("SLVoice") |