diff options
| author | Richard Linden <none@none> | 2010-04-27 11:53:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-04-27 11:53:05 -0700 |
| commit | 5d690aadfcfd7e3981a57614d8720a8d35bed150 (patch) | |
| tree | fa3d7b7a830ec3cf552fe5c26527cff5ef7574ab /indra/newview/viewer_manifest.py | |
| parent | a70f6c3ee6b9f0d758f105eb4f05ad42da9af880 (diff) | |
| parent | 0c643af5289dd20f47b94f4dc7cce1ab9020fba0 (diff) | |
merge
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 19b18b3282..668e21c253 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -332,6 +332,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"): |