aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f631d1f..30c0271 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -246,7 +246,9 @@ class WindowsManifest(ViewerManifest):
246 #self.path("fmod.dll") 246 #self.path("fmod.dll")
247 247
248 # For spellchecking 248 # For spellchecking
249 self.path("libhunspell.dll") 249 if self.prefix(src=self.args['configuration'], dst=""):
250 self.path("libhunspell.dll")
251 self.end_prefix()
250 252
251 # Get llcommon and deps. 253 # Get llcommon and deps.
252 if self.prefix(src=self.args['configuration'], dst=""): 254 if self.prefix(src=self.args['configuration'], dst=""):
@@ -276,12 +278,7 @@ class WindowsManifest(ViewerManifest):
276 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"):
277 self.path("media_plugin_webkit.dll") 279 self.path("media_plugin_webkit.dll")
278 self.end_prefix() 280 self.end_prefix()
279 281
280 # Media plugins - Gstreamer
281 if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
282 self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll")
283 self.end_prefix()
284
285 # For WebKit/Qt plugin runtimes 282 # For WebKit/Qt plugin runtimes
286 if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): 283 if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
287 self.path("libeay32.dll") 284 self.path("libeay32.dll")