Run the 'x86' version of IDNMInstaller only on 32-Bit version of Windows XP.

This commit is contained in:
LoRd_MuldeR 2021-02-16 20:14:22 +01:00
parent fa35e378a5
commit 808236e0fd
2 changed files with 9 additions and 5 deletions

View File

@ -555,6 +555,11 @@ FunctionEnd
RMDir /r ${options} "$INSTDIR\redist" RMDir /r ${options} "$INSTDIR\redist"
!macroend !macroend
!macro InstallRedist srcdir filename
File /a `/oname=$PLUGINSDIR\${filename}` `${srcdir}\${filename}`
ExecWait `"$PLUGINSDIR\${filename}" /passive`
!macroend
;-------------------------------- ;--------------------------------
;Install Files ;Install Files
;-------------------------------- ;--------------------------------
@ -604,11 +609,10 @@ Section "-Install Runtime Libraries"
${If} ${AtMostWinXP} ${If} ${AtMostWinXP}
${AndIfNot} ${FileExists} `$SYSDIR\normaliz.dll` ${AndIfNot} ${FileExists} `$SYSDIR\normaliz.dll`
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_VCREDIST)" !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} ${If} ${RunningX64}
File /a `/oname=$PLUGINSDIR\idndl.x64.exe` `${PrerequisitesDir}\IDNMInstaller\idndl.x64.exe` !insertmacro InstallRedist '${PrerequisitesDir}\IDNMInstaller' 'idndl.x64.exe'
ExecWait `"$PLUGINSDIR\idndl.x64.exe" /passive` ${Else}
!insertmacro InstallRedist '${PrerequisitesDir}\IDNMInstaller' 'idndl.x86.exe'
${EndIf} ${EndIf}
${EndIf} ${EndIf}
SectionEnd SectionEnd

View File

@ -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 2289 #define VER_LAMEXP_BUILD 2291
#define VER_LAMEXP_CONFG 2188 #define VER_LAMEXP_CONFG 2188
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////