Remove 32bit shell dll from 64bit installer

Closes #2408
pull/2434/head
SinghRajenM 8 years ago committed by Don Ho
parent 6fdfd04704
commit 2c2c80a266

@ -29,11 +29,20 @@
${MementoSection} "Context Menu Entry" explorerContextMenu ${MementoSection} "Context Menu Entry" explorerContextMenu
SetOverwrite try SetOverwrite try
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
; There is no need to keep x86 NppShell_06.dll in 64 bit installer
; But in 32bit installer both the Dlls are required
; As user can install 32bit npp version on x64 bit machine, that time x64 bit NppShell is required.
!ifdef ARCH64
File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
!else
${If} ${RunningX64} ${If} ${RunningX64}
File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll" File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
${Else} ${Else}
File "..\bin\NppShell_06.dll" File "..\bin\NppShell_06.dll"
${EndIf} ${EndIf}
!endif
Exec 'regsvr32 /s "$INSTDIR\NppShell_06.dll"' Exec 'regsvr32 /s "$INSTDIR\NppShell_06.dll"'
${MementoSectionEnd} ${MementoSectionEnd}

Loading…
Cancel
Save