diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..72652ad2f --- /dev/null +++ b/.cargo/config @@ -0,0 +1,3 @@ +[target.x86_64-pc-windows-msvc] +# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 +rustflags = ["-Ctarget-feature=+crt-static"] diff --git a/nsis/installer.nsi b/nsis/installer.nsi index 80e61c3e4..944291262 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -92,10 +92,6 @@ section "install" file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe file "logo.ico" - file vc_redist.x64.exe - - ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart' - delete $INSTDIR\vc_redist.x64.exe # Add any other files for the install directory (license files, app data, etc) here # Uninstaller - See function un.onInit and section "uninstall" for configuration