From 56bc62f48c2f574d248a07e9dc4391740932a28c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 21 Jul 2020 04:29:31 -0400
Subject: [PATCH] Fix annoying failure due to redist
---
indra/newview/viewer_manifest.py | 11 -----------
indra/win_crash_logger/CMakeLists.txt | 2 --
2 files changed, 13 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e6ea906b982..f48f073b20e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -526,11 +526,6 @@ def construct(self):
# For textures
self.path("openjpeg.dll")
- # 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
- self.path("msvcp140.dll")
- self.path("vcruntime140.dll")
-
# SLVoice executable
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
self.path("SLVoice.exe")
@@ -598,12 +593,6 @@ def construct(self):
self.path("snapshot_blob.bin")
self.path("v8_context_snapshot.bin")
- # 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("msvcp140.dll")
- self.path("vcruntime140.dll")
-
# CEF files common to all configurations
with self.prefix(src=os.path.join(pkgdir, 'resources')):
self.path("cef.pak")
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 86aa655f034..4440f488a2e 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -101,5 +101,3 @@ if (WINDOWS)
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
)
endif (WINDOWS)
-
-ll_deploy_sharedlibs_command(windows-crash-logger)
--
GitLab