summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-10-31 09:06:09 -0400
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 19:06:12 -0400
commite9ef66815766d87949e35498a0883286142c9665 (patch)
tree344ff86d0a098cc3e5094e38bf2d57e96c6bf8ce /indra/newview/viewer_manifest.py
parent235b37bb761082b19266bc51e44ae44b21ad1188 (diff)
DRTVWR-476: Correct runtime DLL names for VS 2017.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ea8c341e97..292b8b9122 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -528,11 +528,11 @@ class WindowsManifest(ViewerManifest):
# 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 @@ 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("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')):