diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-05 12:24:00 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-05 12:24:00 -0800 |
| commit | 004cd151ff068d348a24127dbeb33696d00d2748 (patch) | |
| tree | 10db4bc4e645cb26a6ae973207fa391ace1841b2 /indra/newview | |
| parent | 011d07f1e3f0cc369993747b50672e82a14fd07c (diff) | |
update copying of fmodex{64}.dll to right place for 32/64 bit builds
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 589d74a014..ef93ad1ac1 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -379,8 +379,8 @@ class WindowsManifest(ViewerManifest): # Get fmodex dll, continue if missing try: - if self.args['configuration'].lower() == 'debug': - self.path("fmodexL.dll") + if(self.args['arch'].lower() == 'x86_64'): + self.path("fmodex64.dll") else: self.path("fmodex.dll") except: @@ -432,11 +432,6 @@ class WindowsManifest(ViewerManifest): self.path("featuretable.txt") self.path("featuretable_xp.txt") - # Media plugins - QuickTime - if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): - self.path("media_plugin_quicktime.dll") - self.end_prefix() - # Media plugins - CEF if self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"): self.path("media_plugin_cef.dll") @@ -447,11 +442,6 @@ class WindowsManifest(ViewerManifest): self.path("media_plugin_libvlc.dll") self.end_prefix() - # winmm.dll shim - if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst=""): - self.path("winmm.dll") - self.end_prefix() - # CEF runtime files - debug if self.args['configuration'].lower() == 'debug': if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'debug'), dst="llplugin"): |