Add the possibility of installing redistributable files from Microsoft
This commit is contained in:
parent
9decd0269e
commit
e02cd6d502
3 changed files with 6 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue