Only install the stubs and plugins of the same bitness as us for now until we can get SCons to actually build both

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6731 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-04-01 17:39:32 +00:00
parent dc0c121b96
commit 8ea946bbf0

View file

@ -120,18 +120,20 @@ VIAddVersionKey "LegalCopyright" "http://nsis.sf.net/License"
;Installer Sections
!macro InstallPlugin pi
File "/oname=$InstDir\Plugins\x86-ansi\${pi}.dll" ..\Plugins\x86-ansi\${pi}.dll
File "/oname=$InstDir\Plugins\x86-unicode\${pi}.dll" ..\Plugins\x86-unicode\${pi}.dll
!ifdef NSIS_MAKENSIS64
File "/oname=$InstDir\Plugins\amd64-unicode\${pi}.dll" ..\Plugins\amd64-unicode\${pi}.dll
!else
File "/oname=$InstDir\Plugins\x86-ansi\${pi}.dll" ..\Plugins\x86-ansi\${pi}.dll
File "/oname=$InstDir\Plugins\x86-unicode\${pi}.dll" ..\Plugins\x86-unicode\${pi}.dll
!endif
!macroend
!macro InstallStub stub
File ..\Stubs\${stub}-x86-ansi
File ..\Stubs\${stub}-x86-unicode
!ifdef NSIS_MAKENSIS64
File ..\Stubs\${stub}-amd64-unicode
!else
File ..\Stubs\${stub}-x86-ansi
File ..\Stubs\${stub}-x86-unicode
!endif
!macroend