From e9ef66815766d87949e35498a0883286142c9665 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 31 Oct 2019 09:06:09 -0400
Subject: [PATCH] DRTVWR-476: Correct runtime DLL names for VS 2017.
---
indra/newview/viewer_manifest.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ea8c341e97d..292b8b91222 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -528,11 +528,11 @@ def construct(self):
# These need to be installed as a SxS assembly, currently a 'private' assembly.
# See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
if self.args['configuration'].lower() == 'debug':
- self.path("msvcr150d.dll")
- self.path("msvcp150d.dll")
+ self.path("msvcr140d.dll")
+ self.path("msvcp140d.dll")
else:
- self.path("msvcr150.dll")
- self.path("msvcp150.dll")
+ self.path("msvcr140.dll")
+ self.path("msvcp140.dll")
# SLVoice executable
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
@@ -606,8 +606,8 @@ def construct(self):
# 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("msvcp150.dll")
- self.path("msvcr150.dll")
+ self.path("msvcp140.dll")
+ self.path("msvcr140.dll")
# CEF files common to all configurations
with self.prefix(src=os.path.join(pkgdir, 'resources')):
--
GitLab