msvc: better support for 32bit architecture
PATCH 1/1 msvc: better support for 32bit architecture
From: Lev Stipakov <[email protected]...>
Previously dependency directory was hardcoded to
..\openvpn-build\msvc\image
which means that to build for 32bit architecture, one needs to rebuild dependencies and do the same again for 64bit architecture.
Add architecture's "bitness" to dependency directory.
As a bonus, add missing libraries to 32bit targets.
This requires correspondig change to openvpn-build:
https://github.com/OpenVPN/openvpn-build/pull/190
--- src/compat/PropertySheet.props | 2 +- src/openvpn/openvpn.vcxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
src/compat/PropertySheet.props +1 -1
@@ -3,7 +3,7 @@ <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros"> <SOURCEBASE>$(SolutionDir)</SOURCEBASE> - <OPENVPN_DEPROOT>$(SOURCEBASE)\..\openvpn-build\msvc\image</OPENVPN_DEPROOT> + <OPENVPN_DEPROOT>$(SOURCEBASE)\..\openvpn-build\msvc\image$(PlatformArchitecture)</OPENVPN_DEPROOT> <OPENSSL_HOME>$(OPENVPN_DEPROOT)</OPENSSL_HOME> <TAP_WINDOWS_HOME>$(OPENVPN_DEPROOT)</TAP_WINDOWS_HOME> <LZO_HOME>$(OPENVPN_DEPROOT)</LZO_HOME>
src/openvpn/openvpn.vcxproj +2 -2
@@ -92,7 +92,7 @@ </ClCompile> <ResourceCompile /> <Link> - <AdditionalDependencies>legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Console</SubSystem> </Link>
@@ -122,7 +122,7 @@ </ClCompile> <ResourceCompile /> <Link> - <AdditionalDependencies>legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Console</SubSystem> </Link>
Signature · 1 line
2.17.1
I won't claim to understand all the intricacies, but the change looks like it would do what the text says - and you're the MSVC master anyway.
Your patch has been applied to the master and release/2.5 branch.
commit fb94fbc31f9d6e434af465bf8a345763f89fddc9 (master) commit 2f0be578e6385941c8135acefd9ef99a6c23c973 (release/2.5)
Author: Lev Stipakov Date: Mon Sep 14 11:44:44 2020 +0300
msvc: better support for 32bit architecture
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg20990.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering