diff --git a/.gitignore b/.gitignore index 7f034c10..22d4d929 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ src/res/qrc_resources.cpp windows/ASIOSDK2 windows/VC_redist.x64.exe windows/vc_redist.x86.exe +windows/nsProcess.dll debug/ release/ build/ diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat index 41979c1b..5a3ce836 100755 --- a/windows/deploy_windows.bat +++ b/windows/deploy_windows.bat @@ -35,9 +35,18 @@ set NSIS_PATH=%PROGRAMFILES(x86)%\NSIS set VS_REDIST32_EXE=vc_redist.x86.exe set VS_REDIST64_EXE=VC_redist.x64.exe +rem check for environment if "%VSINSTALLDIR%" == "" goto vsenvproblem if "%QTDIR32%" == "" goto qtdirproblem if "%QTDIR64%" == "" goto qtdirproblem + +rem check for needed NSIS plugin +if not exist nsProcess.dll ( + echo nsProcess.dll not found. Trying to download the 7z file containing the dll in NsProcess\Plugin. + powershell -Command "Invoke-WebRequest https://nsis.sourceforge.io/mediawiki/images/1/18/NsProcess.zip -OutFile nsProcess.7z" + goto nsispluginproblem +) + cd .. @@ -92,4 +101,8 @@ goto endofskript echo The QTDIR32 and QTDIR64 is not set, please set these environment variables correclty before calling this script goto endofskript +:nsispluginproblem +echo Required NSIS plugin not found. Unzip the nsProcess.dll and copy it in the windows directory before calling this script +goto endofskript + :endofskript diff --git a/windows/nsProcess.dll b/windows/nsProcess.dll deleted file mode 100644 index 4ce01210..00000000 Binary files a/windows/nsProcess.dll and /dev/null differ