diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-27 15:34:43 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-27 15:34:43 -0500 |
| commit | 198046e21d08f7af67287c0ea7260163c424fe0d (patch) | |
| tree | be5840e7b69758588025b0926e7d513b7a415623 /indra/newview | |
| parent | e79b1dfb418ad090c016eaa4d6b1388bde47c274 (diff) | |
Include MSVCP120.DLL and MSVCR120.DLL in Windows viewer package.
Generalize Copy3rdPartyLibs.cmake to eliminate some clone-and-tweak redundancy.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 176f257005..a20ca8802a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -385,11 +385,11 @@ class Windows_i686_Manifest(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("msvcr100d.dll") - self.path("msvcp100d.dll") + self.path("msvcr120d.dll") + self.path("msvcp120d.dll") else: - self.path("msvcr100.dll") - self.path("msvcp100.dll") + self.path("msvcr120.dll") + self.path("msvcp120.dll") # Vivox runtimes self.path("SLVoice.exe") |