From 346e88760c55921ca474886168a89b104fd3f4cc Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sun, 7 Nov 2010 20:28:12 +0000
Subject: Correctly stage libhunspell.dll in viewer_manifest.py

---
 linden/indra/newview/viewer_manifest.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f631d1f..1383bba 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -246,7 +246,9 @@ class WindowsManifest(ViewerManifest):
         #self.path("fmod.dll")
         
         # For spellchecking
-        self.path("libhunspell.dll")
+        if self.prefix(src=self.args['configuration'], dst=""):
+            self.path("libhunspell.dll")
+            self.end_prefix()
 
         # Get llcommon and deps.
         if self.prefix(src=self.args['configuration'], dst=""):
-- 
cgit v1.1


From c722768ddd66c4bf07d562517953ee520a2a10d0 Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sun, 7 Nov 2010 20:29:53 +0000
Subject: As we currently do not build the gstreamer plugin for windows, do not
 try to stage it in viewer_manifest.py

---
 linden/indra/newview/viewer_manifest.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'linden/indra')

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):
         if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
-            
-        # Media plugins - Gstreamer
-        if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
-            self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll")
-            self.end_prefix()
-            
+ 
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
             self.path("libeay32.dll")
-- 
cgit v1.1