diff --git a/installers/Win/DPInst32.exe b/installers/Win/DPInst32.exe new file mode 100644 index 0000000..4af96d0 Binary files /dev/null and b/installers/Win/DPInst32.exe differ diff --git a/installers/Win/DPInst64.exe b/installers/Win/DPInst64.exe new file mode 100644 index 0000000..1a09e67 Binary files /dev/null and b/installers/Win/DPInst64.exe differ diff --git a/installers/Win/nsis_install_script.nsi b/installers/Win/nsis_install_script.nsi index 6a5815b..6ccc8c9 100644 --- a/installers/Win/nsis_install_script.nsi +++ b/installers/Win/nsis_install_script.nsi @@ -24,7 +24,6 @@ ; Instfiles page !insertmacro MUI_PAGE_INSTFILES ; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\FTDI_2.08.14\DPInst.exe" !insertmacro MUI_PAGE_FINISH ; Uninstaller pages @@ -41,6 +40,21 @@ InstallDir "$PROGRAMFILES\P-ROC\libpinproc" ShowInstDetails show ShowUnInstDetails show +Function InstallFTDI + + IfFileExists $WINDIR\SYSWOW64\*.* Is64bit Is32bit + Is32bit: + CopyFiles "$INSTDIR\FTDI_2.08.14\DPInst32.exe" "$INSTDIR\FTDI_2.08.14\DPInst.exe" + GOTO End32Bitvs64BitCheck + + Is64bit: + CopyFiles "$INSTDIR\FTDI_2.08.14\DPInst64.exe" "$INSTDIR\FTDI_2.08.14\DPInst.exe" + End32Bitvs64BitCheck: + + ExecWait '"$INSTDIR\FTDI_2.08.14\DPInst.exe"' + +FunctionEnd + Section "MainSection" SEC01 SetOutPath "$INSTDIR\FTDI_2.08.14\amd64" SetOverwrite try @@ -53,7 +67,8 @@ Section "MainSection" SEC01 File "C:\P-ROC\Install\FTDI_2.08.14\amd64\ftser2k.sys" File "C:\P-ROC\Install\FTDI_2.08.14\amd64\ftserui2.dll" SetOutPath "$INSTDIR\FTDI_2.08.14" - File "C:\P-ROC\Install\FTDI_2.08.14\DPInst.exe" + File "C:\P-ROC\Install\FTDI_2.08.14\DPInst32.exe" + File "C:\P-ROC\Install\FTDI_2.08.14\DPInst64.exe" File "C:\P-ROC\Install\FTDI_2.08.14\DPInst.xml" File "C:\P-ROC\Install\FTDI_2.08.14\ftd2xx.h" File "C:\P-ROC\Install\FTDI_2.08.14\ftdibus.cat" @@ -81,6 +96,7 @@ Section "MainSection" SEC01 SetOutPath "$INSTDIR" SetOverwrite ifnewer File "C:\P-ROC\libpinproc\installers\Win\README.txt" + Call InstallFTDI SectionEnd Section -Post @@ -124,6 +140,8 @@ Section Uninstall Delete "$INSTDIR\FTDI_2.08.14\ftd2xx.h" Delete "$INSTDIR\FTDI_2.08.14\DPInst.xml" Delete "$INSTDIR\FTDI_2.08.14\DPInst.exe" + Delete "$INSTDIR\FTDI_2.08.14\DPInst32.exe" + Delete "$INSTDIR\FTDI_2.08.14\DPInst64.exe" Delete "$INSTDIR\FTDI_2.08.14\CDM 2 04 16 Release Info.doc" Delete "$INSTDIR\FTDI_2.08.14\amd64\ftserui2.dll" Delete "$INSTDIR\FTDI_2.08.14\amd64\ftser2k.sys"