diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 10:42:20 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 10:42:20 +0100 |
| commit | ac52aa08862833ab243fb6afc8c20d148e02c55c (patch) | |
| tree | 755ce223f689260674087dc84b90111dcbee5813 /indra/newview/viewer_manifest.py | |
| parent | d71716aa6dde434b6356cfe85e3a8fce376056dd (diff) | |
| parent | 96df3f3eb1351973d140ba73b507de44b1052c89 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 044dbc9ed7..63437365f9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -341,6 +341,12 @@ class WindowsManifest(ViewerManifest): self.path("media_plugin_webkit.dll") self.end_prefix() + # winmm.dll shim + if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst="llplugin"): + self.path("winmm.dll") + self.end_prefix() + + if self.args['configuration'].lower() == 'debug': if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'debug'), dst="llplugin"): |