summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-02 17:18:36 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-02 17:18:36 +0300
commit7d38dd51c2a59d173bee9c04737002313f4b9dec (patch)
tree4ba43c9a6d4c15ac6f3bd2979558498a43fbcfd1 /indra/newview/viewer_manifest.py
parentf6b48339d9423399ccd1c93709de978ccc7f5a8c (diff)
parenta7085418df1ada6e19b94b6df772ed21e663d119 (diff)
Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py17
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")