From patchwork Tue Oct 10 12:11:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 22 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director6.mail.ord1d.rsapps.net ([172.30.157.13]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id EfHRHeJT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:34 -0400 Received: from proxy19.mail.ord1d.rsapps.net ([172.30.157.64]) by director6.mail.ord1d.rsapps.net (Dovecot) with LMTP id gaq3HeJT3VlQQAAAhgvE6Q ; Tue, 10 Oct 2017 19:12:34 -0400 Received: from smtp1.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.ord1d.rsapps.net (Dovecot) with LMTP id EPNpOt9T3VkAKAAAyH2SIw ; Tue, 10 Oct 2017 19:12:34 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1023-1236-w 0-298-1023-1600-w 0-298-0-30839-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=bqYOPwSi c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=yIP3nxjOAL4h-Q_rWUAA:9 a=h2uRgyYg0cpIqSzG:21 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp1.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 7f806570-ae10-11e7-9a71-842b2b47c027-1-1 Received: from [216.34.181.88] ([216.34.181.88:12846] helo=lists.sourceforge.net) by smtp1.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 05/62-29879-2E35DD95; Tue, 10 Oct 2017 19:12:34 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gv-00009P-AS; Tue, 10 Oct 2017 23:12:01 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gu-00009B-AF for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:12:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=68SKzFi7brfknMyeie7x9IJuYxnZs637zX5AxobQCts=; b=MsCxtDBlg5/Ic03rFkGTirVS7uKuYaE9R8UUMaReq/0iahg3zngnuW+k5QhZ3gmlw75OyeZ+PAj4kmf07/jFcIeKdhEV9gnC4yU1zNte84MEK0+W5zvHudlQgswwEKRtgVL2irUuyLupkeD3mbW6YVLaCblpVvvhOMe3uiEQjoc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=68SKzFi7brfknMyeie7x9IJuYxnZs637zX5AxobQCts=; b=K5V5qp9Sg/9wlXS11ItgFQes8+H9wxyOQDpblWl4j0RTRTQRqXt+lJvxAQ1kOpb94zU/KnwdC22QgxCX0omzorr7aa/ZBuDkRrQEmhXHe6I8JoFbfRd/AFzUWK+bccIPexIEOVltONdD/oSjqNDBgQhlPWOZb3wKiTcMPsGm8Dg=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gr-0000iL-WF for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:12:00 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id BE091407BC; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=tJ2svUhn/G5svcQEkYXOm2prRx5lznxhCvOhFf5GR8U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=ldC4oHluD/0/g6Gu6WOWpp/7gpKYLNBqnEQ0sD4AUEf/wnYg0OMtoXh0khcuOUIMl DkCPFm2IWXLWsBopHzOW7fq4FgVR7JY/TO1IbzYT3Wh/oVOLHP5otH0YYrN3csmGBw liltigOuW5Df3xjyjWc4B8c3b+VjUrcGv5nqplO0= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:30 +0200 Message-Id: <20171010231130.6832-13-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> 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 http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gr-0000iL-WF Subject: [Openvpn-devel] [PATCH 13/13] x64 MSVC configurations introduced 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Simon Rozman --- .gitignore | 1 + build/msvc/msvc-generate/msvc-generate.vcxproj | 42 ++++++++++++-- msvc-env.bat | 1 - openvpn.sln | 16 ++++++ src/compat/compat.vcxproj | 61 +++++++++++++++++++- src/openvpnserv/openvpnserv.vcxproj | 77 ++++++++++++++++++++++++-- 6 files changed, 186 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4543674..ced65ec 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ Release Debug Win32-Output +x64-Output .vs .deps .libs diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj b/build/msvc/msvc-generate/msvc-generate.vcxproj index f5fc921..8978197 100644 --- a/build/msvc/msvc-generate/msvc-generate.vcxproj +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + 15.0 @@ -19,13 +27,23 @@ Makefile - $(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + Makefile + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ Makefile - $(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + Makefile + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ @@ -35,20 +53,36 @@ + + + + + + nmake -ls -f Makefile.mak all nmake -ls -f Makefile.mak clean nmake -lsa -f Makefile.mak all + + nmake -ls -f Makefile.mak all + nmake -ls -f Makefile.mak clean + nmake -lsa -f Makefile.mak all + nmake -ls -f Makefile.mak all nmake -ls -f Makefile.mak clean nmake -lsa -f Makefile.mak all + + nmake -ls -f Makefile.mak all + nmake -ls -f Makefile.mak clean + nmake -lsa -f Makefile.mak all + diff --git a/msvc-env.bat b/msvc-env.bat index aabed75..56b469f 100644 --- a/msvc-env.bat +++ b/msvc-env.bat @@ -13,7 +13,6 @@ set SOURCEBASE=%cd% set SOLUTION=openvpn.sln set CPPFLAGS=%CPPFLAGS%;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS set CPPFLAGS=%CPPFLAGS%;NTDDI_VERSION=NTDDI_VISTA;_WIN32_WINNT=_WIN32_WINNT_VISTA -set CPPFLAGS=%CPPFLAGS%;_USE_32BIT_TIME_T set CPPFLAGS=%CPPFLAGS%;%EXTRA_CPPFLAGS% if exist config-msvc-local.h set CPPFLAGS="%CPPFLAGS%;HAVE_CONFIG_MSVC_LOCAL_H" diff --git a/openvpn.sln b/openvpn.sln index ac865bb..cf5a089 100644 --- a/openvpn.sln +++ b/openvpn.sln @@ -14,23 +14,39 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.ActiveCfg = Debug|Win32 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.Build.0 = Debug|Win32 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|x64.ActiveCfg = Debug|x64 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|x64.Build.0 = Debug|x64 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.ActiveCfg = Release|Win32 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Build.0 = Release|Win32 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|x64.ActiveCfg = Release|x64 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|x64.Build.0 = Release|x64 {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.ActiveCfg = Debug|Win32 + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|x64.ActiveCfg = Debug|Win32 {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.ActiveCfg = Release|Win32 + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|x64.ActiveCfg = Release|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.ActiveCfg = Debug|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Build.0 = Debug|Win32 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|x64.ActiveCfg = Debug|x64 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|x64.Build.0 = Debug|x64 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.ActiveCfg = Release|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.Build.0 = Release|Win32 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|x64.ActiveCfg = Release|x64 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|x64.Build.0 = Release|x64 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.ActiveCfg = Debug|Win32 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.Build.0 = Debug|Win32 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|x64.ActiveCfg = Debug|x64 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|x64.Build.0 = Debug|x64 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.ActiveCfg = Release|Win32 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.Build.0 = Release|Win32 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|x64.ActiveCfg = Release|x64 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj index 997aaf7..0ebd3d5 100644 --- a/src/compat/compat.vcxproj +++ b/src/compat/compat.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + 15.0 @@ -23,11 +31,22 @@ true v141 + + StaticLibrary + Unicode + true + v141 + StaticLibrary Unicode v141 + + StaticLibrary + Unicode + v141 + @@ -36,17 +55,31 @@ + + + + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ @@ -59,6 +92,17 @@ Level3 + + + Disabled + $(SOURCEBASE);$(SOURCEBASE)\include;$(OPENSSL_HOME)\include;$(LZO_HOME)\include;$(PKCS11H_HOME)\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + + MaxSpeed @@ -70,6 +114,17 @@ Level3 + + + MaxSpeed + $(SOURCEBASE);$(SOURCEBASE)\include;$(OPENSSL_HOME)\include;$(LZO_HOME)\include;$(PKCS11H_HOME)\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + + @@ -85,4 +140,4 @@ - + \ No newline at end of file diff --git a/src/openvpnserv/openvpnserv.vcxproj b/src/openvpnserv/openvpnserv.vcxproj index a865bf0..3cbc287 100644 --- a/src/openvpnserv/openvpnserv.vcxproj +++ b/src/openvpnserv/openvpnserv.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + 15.0 @@ -23,11 +31,22 @@ true v141 + + Application + Unicode + true + v141 + Application Unicode v141 + + Application + Unicode + v141 + @@ -36,17 +55,31 @@ + + + + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ @@ -63,7 +96,24 @@ Console - MachineX86 + fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + Disabled + $(SOURCEBASE);$(SOURCEBASE)\include;$(SOURCEBASE)\src\openvpn;$(SOURCEBASE)\src\compat;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + + + $(SOURCEBASE);%(AdditionalIncludeDirectories) + + + Console fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -84,7 +134,26 @@ Console true true - MachineX86 + fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + MaxSpeed + $(SOURCEBASE);$(SOURCEBASE)\include;$(SOURCEBASE)\src\openvpn;$(SOURCEBASE)\src\compat;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + + + $(SOURCEBASE);%(AdditionalIncludeDirectories) + + + Console + true + true fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies)