From 8f69c97c0a427c2f313652a4afea48182ae3df66 Mon Sep 17 00:00:00 2001
From: David Pinedo <david@lunarg.com>
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.
---
 demos/CMakeLists.txt                     |   3 +++
 loader/CMakeLists.txt                    |   2 ++
 windowsRuntimeInstaller/InstallerRT.nsi  |  32 -------------------------------
 windowsRuntimeInstaller/vcredist_x64.exe | Bin 7194312 -> 0 bytes
 windowsRuntimeInstaller/vcredist_x86.exe | Bin 6503984 -> 0 bytes
 5 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 windowsRuntimeInstaller/vcredist_x64.exe
 delete mode 100644 windowsRuntimeInstaller/vcredist_x86.exe

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index c9aea49f..7d8681a0 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -28,6 +28,9 @@ if(WIN32)
         set (BUILDTGT_DIR build32)
     endif()
 
+    set(CMAKE_C_FLAGS_DEBUG "-MTd")
+    set(CMAKE_C_FLAGS_RELEASE "-MT")
+
     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
        COMMAND ${GLSLANG_VALIDATOR} -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
        COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index d6be9c11..2c3b2455 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -37,6 +37,8 @@ set (OPT_LOADER_SRCS
 set (LOADER_SRCS ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS})
 
 if (WIN32)
+    set(CMAKE_C_FLAGS_DEBUG "-MTd")
+    set(CMAKE_C_FLAGS_RELEASE "-MT")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
     # Build dev_ext_trampoline.c with -O2 to allow tail-call optimization.
     # Build other C files with normal options
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