From 8ea946bbf030c9c48b919ec7b0657897032c3893 Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 1 Apr 2016 17:39:32 +0000 Subject: [PATCH] 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 --- Examples/makensis.nsi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 73f9e3bd..e7be9449 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -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