diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-10-31 09:14:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 19:06:12 -0400 |
| commit | e9a75ad31ccfb2e97d5d7bab2dec680e5b52f9a5 (patch) | |
| tree | 22b4efcef37c0436a2c5c2b1db014df91a150128 /indra | |
| parent | e9ef66815766d87949e35498a0883286142c9665 (diff) | |
DRTVWR-476: Throw some more Microsoft runtime DLLs at the viewer.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 292b8b9122..bff18afd53 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -531,8 +531,14 @@ class WindowsManifest(ViewerManifest): self.path("msvcr140d.dll") self.path("msvcp140d.dll") else: + # SL-12205: For reasons not yet diagnosed, an early build of + # the VS 2017 viewer requires VS 2013 runtime DLLs as well as + # VS 2017 runtime DLLs. + self.path("msvcr120.dll") + self.path("msvcp120.dll") self.path("msvcr140.dll") self.path("msvcp140.dll") + self.path("vcruntime140.dll") # SLVoice executable with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): @@ -606,8 +612,11 @@ class WindowsManifest(ViewerManifest): # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'sharedlibs', 'Release')): + self.path("msvcp120.dll") + self.path("msvcr120.dll") self.path("msvcp140.dll") self.path("msvcr140.dll") + self.path("vcruntime140.dll") # CEF files common to all configurations with self.prefix(src=os.path.join(pkgdir, 'resources')): |