summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorAlin Serdean <aserdean@cloudbasesolutions.com>2015-09-23 17:30:32 +0000
committerGurucharan Shetty <gshetty@nicira.com>2015-09-29 11:17:42 -0700
commit1cb3649c0bbacf4f3cea353d02a5e1217b5294b4 (patch)
tree47ea041e4038d65bfa1d5c14984b2118037988f3 /windows
parent34e1211b9a05d42a77cfac185361fc0539f77b21 (diff)
downloadopenvswitch-1cb3649c0bbacf4f3cea353d02a5e1217b5294b4.tar.gz
Add build system for compiling under MSVC x64
This patch adds the modifications needed to compile under x64 under Windows: - created a new macro for testing if we are compiling under x64. this will define the linker flag: "/MACHINE:X64" as per documentation (https://msdn.microsoft.com/en-us/library/9yb4317s.aspx). - added x64 pthread libraries under the pthread defines - add documentation on how to build under x64 Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Diffstat (limited to 'windows')
-rw-r--r--windows/automake.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/windows/automake.mk b/windows/automake.mk
index c8165a40c..fa610ec66 100644
--- a/windows/automake.mk
+++ b/windows/automake.mk
@@ -26,7 +26,7 @@ windows_installer: all
cp -f $(top_srcdir)/ovsdb/ovsdb-client.pdb windows/ovs-windows-installer/Symbols/
cp -f $(top_srcdir)/ovsdb/ovsdb-tool.pdb windows/ovs-windows-installer/Symbols/
#Third party files needed by the installer
- cp -f $(PTHREAD_TEMP_DIR)/../../dll/x86/*.dll windows/ovs-windows-installer/Binaries/
+ 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
#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