aboutsummaryrefslogtreecommitdiff
path: root/windowsRuntimeInstaller
diff options
context:
space:
mode:
authorDavid Pinedo <david@lunarg.com>2016-05-20 15:05:44 -0600
committerDavid Pinedo <david@lunarg.com>2016-05-20 15:05:44 -0600
commit8f69c97c0a427c2f313652a4afea48182ae3df66 (patch)
treea064a8e703beac3d1235070bc49a16f02bcd8657 /windowsRuntimeInstaller
parent1553f6107528573692760b436a4ce21e2d290d8c (diff)
downloadusermoji-8f69c97c0a427c2f313652a4afea48182ae3df66.tar.xz
winrtinstaller: remove dependency on msvcrt redistributables
Loader and demos now use static version of msvcrt. Runtime Installer no longer installs msvcrt.
Diffstat (limited to 'windowsRuntimeInstaller')
-rw-r--r--windowsRuntimeInstaller/InstallerRT.nsi32
-rw-r--r--windowsRuntimeInstaller/vcredist_x64.exebin7194312 -> 0 bytes
-rw-r--r--windowsRuntimeInstaller/vcredist_x86.exebin6503984 -> 0 bytes
3 files changed, 0 insertions, 32 deletions
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
--- a/windowsRuntimeInstaller/vcredist_x64.exe
+++ /dev/null
Binary files differ
diff --git a/windowsRuntimeInstaller/vcredist_x86.exe b/windowsRuntimeInstaller/vcredist_x86.exe
deleted file mode 100644
index b7955781..00000000
--- a/windowsRuntimeInstaller/vcredist_x86.exe
+++ /dev/null
Binary files differ