From e595541da0cebf3c443c3854c4821cbbc4fa4d8e Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 13 Sep 2017 17:21:54 -0700 Subject: [PATCH 1/2] Remove old versions of the VC Runtime from the installation directory --- cmake/templates/NSIS.template.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 5eedbb06ed..ca05294984 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -836,6 +836,8 @@ Section "-Core installation" Delete "$INSTDIR\ui_resources_200_percent.pak" Delete "$INSTDIR\vccorlib120.dll" Delete "$INSTDIR\version" + Delete "$INSTDIR\msvcr140.dll" + Delete "$INSTDIR\msvcp140.dll" Delete "$INSTDIR\xinput1_3.dll" ; Delete old desktop shortcuts before they were renamed during Sandbox rename From 2eff3dcbd6dfd54a8d787cb96523ebbb7d9b2022 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Tue, 19 Sep 2017 09:18:40 -0700 Subject: [PATCH 2/2] Add additional DLL cleanup --- cmake/templates/NSIS.template.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index ca05294984..8abb202bd4 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -838,6 +838,7 @@ Section "-Core installation" Delete "$INSTDIR\version" Delete "$INSTDIR\msvcr140.dll" Delete "$INSTDIR\msvcp140.dll" + Delete "$INSTDIR\vcruntime140.dll" Delete "$INSTDIR\xinput1_3.dll" ; Delete old desktop shortcuts before they were renamed during Sandbox rename