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

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index ce095c2..5a13f07 100644 (file)
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -555,6 +555,11 @@ FunctionEnd
        RMDir /r ${options} "$INSTDIR\redist"
 !macroend
 
+!macro InstallRedist srcdir filename
+       File /a `/oname=$PLUGINSDIR\${filename}` `${srcdir}\${filename}`
+       ExecWait `"$PLUGINSDIR\${filename}" /passive`
+!macroend
+
 ;--------------------------------
 ;Install Files
 ;--------------------------------
@@ -604,11 +609,10 @@ 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`
+                       !insertmacro InstallRedist '${PrerequisitesDir}\IDNMInstaller' 'idndl.x64.exe'
+               ${Else}
+                       !insertmacro InstallRedist '${PrerequisitesDir}\IDNMInstaller' 'idndl.x86.exe'
                ${EndIf}
        ${EndIf}
 SectionEnd

diff --git a/src/Config.h b/src/Config.h
index 1a4e2b3..2588a82 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO                                    9
 #define VER_LAMEXP_TYPE                                                RC
 #define VER_LAMEXP_PATCH                                       2
-#define VER_LAMEXP_BUILD                                       2289
+#define VER_LAMEXP_BUILD                                       2291
 #define VER_LAMEXP_CONFG                                       2188
 
 ///////////////////////////////////////////////////////////////////////////////