From e90047bddd0648d900e777d95fa3dd43686ef577 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 17 Jan 2023 17:45:07 +0100 Subject: [PATCH] Revert "Make VS2017 runtime optional so we can compile with VS2022 (for local" since that's not true if you setup the build correctly and those runtimes need to get packaged with the viewer This reverts commit 9ff2ed73523d357c7cd7c20d4e667188f557a458. --- indra/newview/viewer_manifest.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 20ebbb3e7e..7f5907d08a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -630,8 +630,8 @@ 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 - self.path_optional("msvcp140.dll") # FS:ND make them optional to be able to build with VS2022, on a developer PC this will not be harmful - self.path_optional("vcruntime140.dll") # FS:ND make them optional to be able to build with VS2022, on a developer PC this will not be harmful + self.path("msvcp140.dll") + self.path("vcruntime140.dll") self.path_optional("vcruntime140_1.dll") # SLVoice executable @@ -722,11 +722,10 @@ class WindowsManifest(ViewerManifest): self.path("v8_context_snapshot.bin") # MSVC DLLs needed for CEF and have to be in same directory as plugin - # FS:ND They are all optional, as when compilig with VS2022 they won't be available' with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'sharedlibs', 'Release')): - self.path_optional("msvcp140.dll") - self.path_optional("vcruntime140.dll") + self.path("msvcp140.dll") + self.path("vcruntime140.dll") self.path_optional("vcruntime140_1.dll") # CEF files common to all configurations