From e02cd6d502ce0a95a48b4f7ee607bdacb46ddd02 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@users.sourceforge.net>
Date: Wed, 5 Jan 2011 16:07:34 +0100
Subject: [PATCH] Add the possibility of installing redistributable files from
 Microsoft

---
 msvc/Makefile         | 5 ++++-
 msvc/util/ecl_nsi.bat | 1 -
 src/util/ecl.nsi2     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/msvc/Makefile b/msvc/Makefile
index d46ccd01..0efeffe0 100755
--- a/msvc/Makefile
+++ b/msvc/Makefile
@@ -89,10 +89,12 @@ CFLAGS_SSE=/arch:SSE2
 GMP_BITS=64
 GC_CPU=AMD64
 ARCHITECTURE=AMD64
+VCREDIST=vcredist_x64.exe
 !else
 GMP_BITS=32
 GC_CPU=i386
 ARCHITECTURE=PENTIUM4
+VCREDIST=vcredist_x86.exe
 !endif
 
 #
@@ -396,10 +398,11 @@ windows-nsi:
 	IF EXIST "$(TAR_DIR)" $(RMDIR) "$(TAR_DIR)"
 	$(MKDIR) "$(TAR_DIR)"
 	$(MAKE) prefix="$(TAR_DIR)" install ECL_UNICODE=$(ECL_UNICODE)
+	IF EXIST "$(VCREDIST)" $(CP) "$(VCREDIST)" "$(TAR_DIR)"
 	util\ecl_nsi.bat %%CD%%\"$(srcdir)"\util\ecl.nsi "$(TAR_DIR)" $(ECL_VERSION)
 	"$(MKNSI)" "$(TAR_DIR)/ecl.nsi"
 	$(MV) $(TAR_DIR)\Setup.exe ecl-$(ECL_VERSION).exe
-	$(RMDIR) $(TAR_DIR)
+#	$(RMDIR) $(TAR_DIR)
 
 clean: clean_ecl clean_lisp
 	-$(RM) .gdbinit cinit.lib ecl_min.lib
diff --git a/msvc/util/ecl_nsi.bat b/msvc/util/ecl_nsi.bat
index b976a395..aa34fb97 100755
--- a/msvc/util/ecl_nsi.bat
+++ b/msvc/util/ecl_nsi.bat
@@ -22,5 +22,4 @@ if exist ecl.exe.manifest @echo Delete "${ECLDIR}\ecl.exe.manifest" >> %dest%
 for /f %%i in (../aux_files) do @echo Delete "$INSTDIR\%%i" >> %dest%
 for /f %%i in (../aux_dirs) do @echo RMDir /r "$INSTDIR\%%i" >> %dest%
 type %source%3 >> %dest%
-
 ENDLOCAL
diff --git a/src/util/ecl.nsi2 b/src/util/ecl.nsi2
index 121369ee..00ddb4ec 100644
--- a/src/util/ecl.nsi2
+++ b/src/util/ecl.nsi2
@@ -15,6 +15,8 @@ Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+  ExecShell "" "$INSTDIR\vcredist_x86.exe"
+  ExecShell "" "$INSTDIR\vcredist_x64.exe"
 SectionEnd