livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 9ff2ed7352.
meow-7.2.2
Ansariel 2023-01-17 17:45:07 +01:00
parent 61b8870fcf
commit e90047bddd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/viewer_manifest.py
View File

@ -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