diff options
| author | Alin Gabriel Serdean <aserdean@ovn.org> | 2020-09-24 09:20:23 +0300 |
|---|---|---|
| committer | Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> | 2020-10-04 22:09:43 +0300 |
| commit | fd8e707f38d06014f7e17319a4a10179e6dc66e1 (patch) | |
| tree | b4d29fcfb8e80d2e023734deeeba139f01937835 /windows/automake.mk | |
| parent | aaa1df71fd2f068f16cdfdee9433c450fe4491b0 (diff) | |
| download | openvswitch-fd8e707f38d06014f7e17319a4a10179e6dc66e1.tar.gz | |
windows, installer: Bundle latest runtime version
Until now we were bundling MSVC120 x86 runtime.
This patch changes it too the latest version and also add the 64 bit version
of it.
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'windows/automake.mk')
| -rw-r--r-- | windows/automake.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/windows/automake.mk b/windows/automake.mk index 49c8985fd..ce1fac66c 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -26,7 +26,8 @@ windows_installer: all cp -f $(top_srcdir)/ovsdb/ovsdb-tool.pdb windows/ovs-windows-installer/Symbols/ #Third party files needed by the installer cp -f $(PTHREAD_WIN32_DIR_DLL_WIN_FORM)/*.dll windows/ovs-windows-installer/Binaries/ - cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC120_CRT_x86.msm" windows/ovs-windows-installer/Redist/Microsoft_VC120_CRT_x86.msm + cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x86.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x86.msm + cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x64.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x64.msm #Forwarding extension files needed for the installer cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8/ovsext.cat cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8/ovsext.inf |