Install the required "normaliz.dll" on Windows XP, if it is missing. Needed by cURL and possibly others.
This commit is contained in:
parent
09d38cd925
commit
fa35e378a5
@ -59,6 +59,8 @@
|
|||||||
;Web-Site
|
;Web-Site
|
||||||
!define MyWebSite "http://muldersoft.com/"
|
!define MyWebSite "http://muldersoft.com/"
|
||||||
|
|
||||||
|
;Prerequisites
|
||||||
|
!define PrerequisitesDir "..\..\..\Prerequisites"
|
||||||
|
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
;Check for Pre-Release
|
;Check for Pre-Release
|
||||||
@ -79,7 +81,7 @@
|
|||||||
;--------------------------------
|
;--------------------------------
|
||||||
|
|
||||||
!tempfile PACKHDRTEMP
|
!tempfile PACKHDRTEMP
|
||||||
!packhdr "${PACKHDRTEMP}" '"..\..\..\Prerequisites\MSVC\redist\bin\mt.exe" -manifest "setup.manifest" -outputresource:"${PACKHDRTEMP};1" && "..\..\..\Prerequisites\UPX\upx.exe" --brute "${PACKHDRTEMP}"'
|
!packhdr "${PACKHDRTEMP}" '"${PrerequisitesDir}\MSVC\redist\bin\mt.exe" -manifest "setup.manifest" -outputresource:"${PACKHDRTEMP};1" && "${PrerequisitesDir}\UPX\upx.exe" --brute "${PACKHDRTEMP}"'
|
||||||
|
|
||||||
|
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
@ -593,17 +595,24 @@ Section "!Install Files"
|
|||||||
File /a /r `${LAMEXP_SOURCE_PATH}\*.png`
|
File /a /r `${LAMEXP_SOURCE_PATH}\*.png`
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
# Section "-Install VCRedist"
|
|
||||||
# !insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_VCREDIST)"
|
|
||||||
# File /a `/oname=$PLUGINSDIR\vcredist_x86.exe` `${LAMEXP_SOURCE_PATH}\redist\vcredist_x86.exe`
|
|
||||||
# ExecWait '"$PLUGINSDIR\vcredist_x86.exe" /install /passive /norestart'
|
|
||||||
# SectionEnd
|
|
||||||
|
|
||||||
Section "-Write Uninstaller"
|
Section "-Write Uninstaller"
|
||||||
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_MAKEUNINST)"
|
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_MAKEUNINST)"
|
||||||
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
Section "-Install Runtime Libraries"
|
||||||
|
${If} ${AtMostWinXP}
|
||||||
|
${AndIfNot} ${FileExists} `$SYSDIR\normaliz.dll`
|
||||||
|
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_VCREDIST)"
|
||||||
|
File /a `/oname=$PLUGINSDIR\idndl.x86.exe` `${PrerequisitesDir}\IDNMInstaller\idndl.x86.exe`
|
||||||
|
ExecWait `"$PLUGINSDIR\idndl.x86.exe" /passive`
|
||||||
|
${If} ${RunningX64}
|
||||||
|
File /a `/oname=$PLUGINSDIR\idndl.x64.exe` `${PrerequisitesDir}\IDNMInstaller\idndl.x64.exe`
|
||||||
|
ExecWait `"$PLUGINSDIR\idndl.x64.exe" /passive`
|
||||||
|
${EndIf}
|
||||||
|
${EndIf}
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
Section "-Create Shortcuts"
|
Section "-Create Shortcuts"
|
||||||
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
||||||
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_SHORTCUTS)"
|
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_SHORTCUTS)"
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#define VER_LAMEXP_MINOR_LO 9
|
#define VER_LAMEXP_MINOR_LO 9
|
||||||
#define VER_LAMEXP_TYPE RC
|
#define VER_LAMEXP_TYPE RC
|
||||||
#define VER_LAMEXP_PATCH 2
|
#define VER_LAMEXP_PATCH 2
|
||||||
#define VER_LAMEXP_BUILD 2288
|
#define VER_LAMEXP_BUILD 2289
|
||||||
#define VER_LAMEXP_CONFG 2188
|
#define VER_LAMEXP_CONFG 2188
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
Loading…
Reference in New Issue
Block a user