aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorRobin Cornelius2010-11-07 20:29:53 +0000
committerRobin Cornelius2010-11-07 20:29:53 +0000
commitc722768ddd66c4bf07d562517953ee520a2a10d0 (patch)
treecc952870235b2d127aed6ba8107323b03607eafe /linden/indra
parentCorrectly stage libhunspell.dll in viewer_manifest.py (diff)
downloadmeta-impy-c722768ddd66c4bf07d562517953ee520a2a10d0.zip
meta-impy-c722768ddd66c4bf07d562517953ee520a2a10d0.tar.gz
meta-impy-c722768ddd66c4bf07d562517953ee520a2a10d0.tar.bz2
meta-impy-c722768ddd66c4bf07d562517953ee520a2a10d0.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 'linden/indra')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 1383bba..30c0271 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -278,12 +278,7 @@ class WindowsManifest(ViewerManifest):
278 if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"): 278 if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
279 self.path("media_plugin_webkit.dll") 279 self.path("media_plugin_webkit.dll")
280 self.end_prefix() 280 self.end_prefix()
281 281
282 # Media plugins - Gstreamer
283 if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
284 self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll")
285 self.end_prefix()
286
287 # For WebKit/Qt plugin runtimes 282 # For WebKit/Qt plugin runtimes
288 if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): 283 if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
289 self.path("libeay32.dll") 284 self.path("libeay32.dll")