From 8f69c97c0a427c2f313652a4afea48182ae3df66 Mon Sep 17 00:00:00 2001 From: David Pinedo Date: Fri, 20 May 2016 15:05:44 -0600 Subject: winrtinstaller: remove dependency on msvcrt redistributables Loader and demos now use static version of msvcrt. Runtime Installer no longer installs msvcrt. --- windowsRuntimeInstaller/InstallerRT.nsi | 32 ------------------------------- windowsRuntimeInstaller/vcredist_x64.exe | Bin 7194312 -> 0 bytes windowsRuntimeInstaller/vcredist_x86.exe | Bin 6503984 -> 0 bytes 3 files changed, 32 deletions(-) delete mode 100644 windowsRuntimeInstaller/vcredist_x64.exe delete mode 100644 windowsRuntimeInstaller/vcredist_x86.exe (limited to 'windowsRuntimeInstaller') diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index 6b1771f4..680a14a3 100644 --- a/windowsRuntimeInstaller/InstallerRT.nsi +++ b/windowsRuntimeInstaller/InstallerRT.nsi @@ -460,38 +460,6 @@ Section # by the uninstaller when it needs to be run again during uninstall. Delete ConfigLayersAndVulkanDLL.ps1 - # Possibly install MSVC 2013 redistributables - ClearErrors - ${If} ${RunningX64} - ReadRegDword $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\DevDiv\vc\Servicing\12.0\RuntimeMinimum" "Install" - ${If} ${Errors} - StrCpy $1 0 - ClearErrors - ${Endif} - ${Else} - StrCpy $1 1 - ${Endif} - ReadRegDword $2 HKLM "SOFTWARE\Microsoft\DevDiv\vc\Servicing\12.0\RuntimeMinimum" "Install" - ${If} ${Errors} - StrCpy $2 0 - ClearErrors - ${Endif} - IntOp $3 $1 + $2 - ${If} $3 <= 1 - # If either x86 or x64 redistributables are not present, install redistributables. - # We install both resdistributables because we have found that the x86 redist - # will uninstall the x64 redist if the x64 redistrib is an old version. Amazing, isn't it? - SetOutPath "$TEMP\VulkanRT" - ${If} ${RunningX64} - File vcredist_x64.exe - ExecWait '"$TEMP\VulkanRT\vcredist_x64.exe" /quiet /norestart' - ${Endif} - File vcredist_x86.exe - ExecWait '"$TEMP\VulkanRT\vcredist_x86.exe" /quiet /norestart' - ${Endif} - StrCpy $1 65 - Call CheckForError - # Finish logging and move log file to TEMP dir LogSet off Rename "$INSTDIR\install.log" "$TEMP\VulkanRT\Install.log" diff --git a/windowsRuntimeInstaller/vcredist_x64.exe b/windowsRuntimeInstaller/vcredist_x64.exe deleted file mode 100644 index 54736409..00000000 Binary files a/windowsRuntimeInstaller/vcredist_x64.exe and /dev/null differ diff --git a/windowsRuntimeInstaller/vcredist_x86.exe b/windowsRuntimeInstaller/vcredist_x86.exe deleted file mode 100644 index b7955781..00000000 Binary files a/windowsRuntimeInstaller/vcredist_x86.exe and /dev/null differ -- cgit v1.2.3