Skip to content

Commit

Permalink
installer-windows: Add x64 installer build via command line
Browse files Browse the repository at this point in the history
Add a new variable to know on which platform we are compiling.

Make the msbuild command to be aware of the platform we want to build.

Shorter the msbuild parameters from `property:`->`p:`. Change slashes
to double slashes so msys does not get confused.

Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Alin Balutoiu <abalutoiu@cloudbasesolutions.com>
  • Loading branch information
aserdean committed Nov 14, 2017
1 parent abbb33e commit b0bf5ef
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions Makefile.am
Expand Up @@ -20,6 +20,7 @@ AM_CPPFLAGS += $(PTHREAD_INCLUDES)
AM_CPPFLAGS += $(MSVC_CFLAGS)
AM_LDFLAGS += $(PTHREAD_LDFLAGS)
AM_LDFLAGS += $(MSVC64_LDFLAGS)
PLATFORM = $(MSVC_PLATFORM)
endif

AM_CPPFLAGS += -I $(top_srcdir)/include
Expand Down
3 changes: 3 additions & 0 deletions m4/openvswitch.m4
Expand Up @@ -79,11 +79,14 @@ AC_DEFUN([OVS_CHECK_WIN64],
if (cl) 2>&1 | grep 'x64' >/dev/null 2>&1; then
cl_cv_x64=yes
MSVC64_LDFLAGS=" /MACHINE:X64 "
MSVC_PLATFORM="x64"
else
cl_cv_x64=no
MSVC64_LDFLAGS=""
MSVC_PLATFORM="x86"
fi])
AC_SUBST([MSVC64_LDFLAGS])
AC_SUBST([MSVC_PLATFORM])
])

dnl Checks for WINDOWS.
Expand Down
2 changes: 1 addition & 1 deletion windows/automake.mk
Expand Up @@ -35,7 +35,7 @@ windows_installer: all
cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8.1/ovsext.cat
cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8.1/ovsext.inf
cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win8.1/ovsext.sys
MSBuild.exe windows/ovs-windows-installer.sln //nologo /target:Build /property:Configuration="Release" /property:Version="$(PACKAGE_VERSION)"
MSBuild.exe windows/ovs-windows-installer.sln //nologo //target:Build //p:Configuration="Release" //p:Version="$(PACKAGE_VERSION)" //p:Platform=$(PLATFORM)

EXTRA_DIST += \
windows/automake.mk \
Expand Down

0 comments on commit b0bf5ef

Please sign in to comment.