From patchwork Thu May 13 06:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1813 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id qG2cOdFEomBpRwAAIUCqbw (envelope-from ) for ; Mon, 17 May 2021 06:26:25 -0400 Received: from proxy2.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id IP1sOdFEomDscgAA91zNiA (envelope-from ) for ; Mon, 17 May 2021 06:26:25 -0400 Received: from smtp19.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1d.rsapps.net with LMTPS id 4GUDOdFEomAxVAAAfawv4w (envelope-from ) for ; Mon, 17 May 2021 06:26:25 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp19.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 54fdc4cc-b6fa-11eb-a042-525400d67fa8-1-1 Received: from [216.105.38.7] ([216.105.38.7:42536] helo=lists.sourceforge.net) by smtp19.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4F/3F-31957-1D442A06; Mon, 17 May 2021 06:26:25 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1liaR8-0004z1-5C; Mon, 17 May 2021 10:25:22 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liaR6-0004yp-Fy for openvpn-devel@lists.sourceforge.net; Mon, 17 May 2021 10:25:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bXb9bdSJu4D+dJcYHBYaGigOnPFqv2q+gRxIbXf/e8E=; b=Mpnx3CH+rPzBe0CtwVXm7nn2UJ DDcXKSUxl7Bt2DTDBdrx+4wo+5PRDe6vCTb5Vm2d80+lq00nzIW5aF/GE0oct9HU50KxOvPk1Tb2T SFeipgYpT5vspz88XNrYm/jqpYDmnsi3862uieE6QjqqSINLRfBtEf8DGefLbOOGBT7c=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=bXb9bdSJu4D+dJcYHBYaGigOnPFqv2q+gRxIbXf/e8E=; b=b4mxqvCMpx3x2Pr5Up9jtynl7g 8jDvm0B7Zi7jyyDFn4OGSVGLwlgtm7L0YLAAV0HyEqbWEQ8u5DrFueHCXIKKj/2bJxvYXyHKdP6tc oOh+BK22TKknPzUjD7N/h6X6oFMWywDf0QkNB8rzy6t+59gkIhM3KWolnKkrYVaA410s=; Received: from mail-wm1-f48.google.com ([209.85.128.48]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1liaQy-0003ht-HM for openvpn-devel@lists.sourceforge.net; Mon, 17 May 2021 10:25:21 +0000 Received: by mail-wm1-f48.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso4996293wmc.1 for ; Mon, 17 May 2021 03:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bXb9bdSJu4D+dJcYHBYaGigOnPFqv2q+gRxIbXf/e8E=; b=bdZX3uQRtI4Xuyav17xDD2te6j3kEBbMSpliDGsVdXnmQRcN1aPFl4RCAOcTFHf0o+ jKCk0+Q9g4NguiOv98naKjgr+pdaaRTg1bx9vt3Pdv/QX67ziEaDh/jP8+kpNYLRu6V/ /GzLcU0EXMTakpAktChhpDtTN2QWAkTwwBkBu2Mw+/WOhSdEtVi4n4XPvnAa7V4mJtnf 6SI11R8JyxiPV9UJ/F4jOlQtJHgWmGewI5N2kFGtgkWic1oDgktcTtiT7Asx3drJJDlS uBmpfiinbyz0MyA4khyxd8fF91Du0l2W56iMGd5F0J4ZyuIWOopJ4fEc0GebQ6jPulm/ zHvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bXb9bdSJu4D+dJcYHBYaGigOnPFqv2q+gRxIbXf/e8E=; b=dAVHu+KojccB2BmaJZ15MBjKkS/tlrMAaaQZYXKIXI81mq+dNnYwMARzHLplipFQiw U4ZS/AJW93mchAQ+YONuzwZj6LGUgoywVq8jyzhWb1D8mDy2R2ZZ58RKB/B7fCFSjhGd XvJpe/j2AHeZPLclIDo/13t5a3KRZfFFNnqsyLjuNTT4WRQiFV6Y3iGeZ1yqh+yspmlc KhZi1TdULi4fS9hLOzqssoG1o7JFJUlfcvfu7xRNaCjh7tC+FtNAw5MTZF9SaNsR4aDy c6tGXHqZNTakyvMK4F30GJg0NNq4ZcRyIBDaK6/e4LSNrhJymR/B31RkMsaVK/OIaiCm 630Q== X-Gm-Message-State: AOAM5320rVY/UjutIz9WfFx9D+2R4QM3L0Wkqg6yFcPopdDXgG7lqKL7 0OV0jcGmLZd7B3hAJHi2iACzyD/scAc= X-Google-Smtp-Source: ABdhPJyjkNnaribS9BTN1GSHWfGdUimSCQD5rPK13bgqa6DLsSbcL7hltGbQtg2hSucVL38HzpuaNA== X-Received: by 2002:a7b:cc83:: with SMTP id p3mr7553996wma.169.1621247106226; Mon, 17 May 2021 03:25:06 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat4.panoulu.net. [185.38.2.4]) by smtp.gmail.com with ESMTPSA id h14sm13981373wmb.1.2021.05.17.03.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 03:25:05 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 13 May 2021 19:43:22 +0300 Message-Id: <20210513164322.369-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.48 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.48 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1liaQy-0003ht-HM Subject: [Openvpn-devel] [PATCH] msvc: standalone building X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov This finally enables standalone MSVC building, without dependency on openvpn-build/msvc. This makes MSVC build process much simpler. Dependencies are managed by vcpkg. To install dependencies, run: > vcpkg --overlay-ports=\contrib\vcpkg-ports install lz4:x64-windows lzo:x64-windows openssl-windows:x64-windows pkcs11-helper:x64-windows tap-windows6:x64-windows Other triples could be used, such as x86-windows and arm64-windows. Since we don't have CMake support yet, we cannot use vcpkg manifest mode, since it doesn't work with overlay ports (https://github.com/microsoft/vcpkg/issues/12289), therefore this one-time manual dependency installation is required. While on it, bump msvc-generate project target version to VS2019 and cleanup leftovers from compat.vcxproj.filters. Signed-off-by: Lev Stipakov --- .../msvc/msvc-generate/msvc-generate.vcxproj | 14 +++---- src/compat/compat.vcxproj | 30 ++++++++++--- src/compat/compat.vcxproj.filters | 6 --- src/openvpn/openvpn.vcxproj | 42 +++++++++++++------ src/openvpnmsica/openvpnmsica.vcxproj | 18 ++++++++ src/openvpnserv/openvpnserv.vcxproj | 18 ++++++++ src/tapctl/tapctl.vcxproj | 18 ++++++++ 7 files changed, 115 insertions(+), 31 deletions(-) diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj b/build/msvc/msvc-generate/msvc-generate.vcxproj index dd947f98..dda8b051 100644 --- a/build/msvc/msvc-generate/msvc-generate.vcxproj +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj @@ -30,32 +30,32 @@ {8598C2C8-34C4-47A1-99B0-7C295A890615} msvc-generate MakeFileProj - 10.0.17134.0 + 10.0 Makefile - v141 + v142 Makefile - v141 + v142 Makefile - v141 + v142 Makefile - v141 + v142 Makefile - v141 + v142 Makefile - v141 + v142 diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj index 1a11deb4..49824783 100644 --- a/src/compat/compat.vcxproj +++ b/src/compat/compat.vcxproj @@ -97,39 +97,57 @@ <_ProjectFileVersion>10.0.30319.1 + + true + + + true + + + true + + + true + + + true + + + true + - $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) - $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) - $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) - $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) - $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) - $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) diff --git a/src/compat/compat.vcxproj.filters b/src/compat/compat.vcxproj.filters index 404863ca..96ca026a 100644 --- a/src/compat/compat.vcxproj.filters +++ b/src/compat/compat.vcxproj.filters @@ -24,12 +24,6 @@ Source Files - - Source Files - - - Source Files - Source Files diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 370345a1..612d6aec 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -115,92 +115,110 @@ false + + true + + + true + + + true + + + true + + + true + + + true + - ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) %(UndefinePreprocessorDefinitions) Level2 true + ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) - 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) + Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console - ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) %(UndefinePreprocessorDefinitions) Level2 true + ..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories) - 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) + Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console - ..\compat;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) %(UndefinePreprocessorDefinitions) Level2 true + ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) - legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;%(AdditionalDependencies) + Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console - ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) %(UndefinePreprocessorDefinitions) Level2 true + ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) - 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) + Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console - ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) %(UndefinePreprocessorDefinitions) Level2 true + ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) - 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) + Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console - ..\compat;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) %(UndefinePreprocessorDefinitions) Level2 true + ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) - legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;%(AdditionalDependencies) + Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console diff --git a/src/openvpnmsica/openvpnmsica.vcxproj b/src/openvpnmsica/openvpnmsica.vcxproj index 4b429806..c39b1240 100644 --- a/src/openvpnmsica/openvpnmsica.vcxproj +++ b/src/openvpnmsica/openvpnmsica.vcxproj @@ -111,6 +111,24 @@ + + true + + + true + + + true + + + true + + + true + + + true + diff --git a/src/openvpnserv/openvpnserv.vcxproj b/src/openvpnserv/openvpnserv.vcxproj index ee7d52ea..8009ab3d 100644 --- a/src/openvpnserv/openvpnserv.vcxproj +++ b/src/openvpnserv/openvpnserv.vcxproj @@ -97,6 +97,24 @@ <_ProjectFileVersion>10.0.30319.1 + + true + + + true + + + true + + + true + + + true + + + true + ..\openvpn;..\compat;%(AdditionalIncludeDirectories) diff --git a/src/tapctl/tapctl.vcxproj b/src/tapctl/tapctl.vcxproj index 1d593fc1..ad96f02c 100644 --- a/src/tapctl/tapctl.vcxproj +++ b/src/tapctl/tapctl.vcxproj @@ -111,6 +111,24 @@ + + true + + + true + + + true + + + true + + + true + + + true +