Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove 32bit shell dll from 64bit installer

Browse Source 
Closes #2408
This commit is contained in:
SinghRajenM 2016-11-04 01:59:53 +05:30 committed by Don Ho
parent 6fdfd04704
commit 2c2c80a266
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PowerEditor/installer/nsisInclude/binariesComponents.nsh
View File

@ -29,11 +29,20 @@
${MementoSection} "Context Menu Entry" explorerContextMenu ${MementoSection} "Context Menu Entry" explorerContextMenu
SetOverwrite try SetOverwrite try
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
${If} ${RunningX64}
; 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" File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
${Else} !else
File "..\bin\NppShell_06.dll" ${If} ${RunningX64}
${EndIf} File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
${Else}
File "..\bin\NppShell_06.dll"
${EndIf}
!endif
Exec 'regsvr32 /s "$INSTDIR\NppShell_06.dll"' Exec 'regsvr32 /s "$INSTDIR\NppShell_06.dll"'
${MementoSectionEnd} ${MementoSectionEnd}