From: simon@...2293... Date: Wed, 11 Oct 2017 01:11:30 +0200 Message-Id: <20171010231130.6832-13-simon@...2293...> In-Reply-To: <20171010231130.6832-1-simon@...2293...> References: <20171010231130.6832-1-simon@...2293...> Subject: [Openvpn-devel] [PATCH 13/13] x64 MSVC configurations introduced List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net 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) -- 2.9.0.windows.1