diff options
author | Robin Cornelius | 2010-11-07 20:29:53 +0000 |
---|---|---|
committer | McCabe Maxsted | 2010-11-08 21:25:27 -0700 |
commit | 257a706943a31507388c3a34fa0a744b409b1a4f (patch) | |
tree | ce18667765534780ab6942e3f9a454fb3b16b054 /linden/indra/newview/viewer_manifest.py | |
parent | Correctly stage libhunspell.dll in viewer_manifest.py (diff) | |
download | meta-impy-257a706943a31507388c3a34fa0a744b409b1a4f.zip meta-impy-257a706943a31507388c3a34fa0a744b409b1a4f.tar.gz meta-impy-257a706943a31507388c3a34fa0a744b409b1a4f.tar.bz2 meta-impy-257a706943a31507388c3a34fa0a744b409b1a4f.tar.xz |
As we currently do not build the gstreamer plugin for windows, do not try to stage it in viewer_manifest.py
Diffstat (limited to '')
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index b1bb250..6dcd977 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -270,12 +270,7 @@ class WindowsManifest(ViewerManifest): | |||
270 | if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"): | 270 | if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"): |
271 | self.path("media_plugin_webkit.dll") | 271 | self.path("media_plugin_webkit.dll") |
272 | self.end_prefix() | 272 | self.end_prefix() |
273 | 273 | ||
274 | # Media plugins - Gstreamer | ||
275 | if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"): | ||
276 | self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll") | ||
277 | self.end_prefix() | ||
278 | |||
279 | # For WebKit/Qt plugin runtimes | 274 | # For WebKit/Qt plugin runtimes |
280 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): | 275 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): |
281 | self.path("libeay32.dll") | 276 | self.path("libeay32.dll") |