From 03a906771e2fb6815067838d61d3bd8e03bc257a Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Wed, 5 Jun 2019 13:03:15 +0300 Subject: [PATCH] win: add OpenSSL as solution configuration This also removes unittest.vcxproj from solution, since it is deprecated in favor of CMake-based unit tests. Signed-off-by: Lev Stipakov --- test/unittests/unittests.vcxproj | 32 +++++++++++++++++ win/ovpn3-core.sln | 22 +++++++----- win/ovpn3-core.vcxproj | 61 +++++++++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 9 deletions(-) diff --git a/test/unittests/unittests.vcxproj b/test/unittests/unittests.vcxproj index 20242c9f..7bd68f7b 100644 --- a/test/unittests/unittests.vcxproj +++ b/test/unittests/unittests.vcxproj @@ -5,6 +5,10 @@ Debug x64 + + ReleaseOpenSSL + x64 + Release x64 @@ -29,6 +33,13 @@ true MultiByte + + Application + false + v140 + true + MultiByte + @@ -40,6 +51,9 @@ + + + @@ -75,6 +89,24 @@ $(OVPN3_ROOT)\deps\amd64\mbedtls\library;$(GTEST_ROOT)\googlemock\gtest\Release\;%(AdditionalLibraryDirectories);$(OVPN3_ROOT)\deps\amd64\lz4\lib + + + TurnOffAllWarnings + MaxSpeed + true + true + false + $(OVPN3_ROOT)\deps\amd64\mbedtls\include;$(OVPN3_ROOT)\deps\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_ROOT)\core;$(OVPN3_ROOT)\deps\amd64\asio\asio\include;$(OVPN3_ROOT)\deps\amd64\tap-windows\src;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions) + + + true + true + true + lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies) + $(OVPN3_ROOT)\deps\amd64\mbedtls\library;$(GTEST_ROOT)\googlemock\gtest\Release\;%(AdditionalLibraryDirectories);$(OVPN3_ROOT)\deps\amd64\lz4\lib + + diff --git a/win/ovpn3-core.sln b/win/ovpn3-core.sln index 39d347e6..15249a88 100644 --- a/win/ovpn3-core.sln +++ b/win/ovpn3-core.sln @@ -5,32 +5,38 @@ VisualStudioVersion = 15.0.28307.106 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "ovpn3-core.vcxproj", "{1F891260-2039-494F-9777-EC5166AF31BC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "..\test\unittests\unittests.vcxproj", "{18446924-20CC-4EB7-B639-A76C1422E5C2}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + DebugOpenSSL|ARM = DebugOpenSSL|ARM + DebugOpenSSL|x64 = DebugOpenSSL|x64 + DebugOpenSSL|x86 = DebugOpenSSL|x86 Release|ARM = Release|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 + ReleaseOpenSSL|ARM = ReleaseOpenSSL|ARM + ReleaseOpenSSL|x64 = ReleaseOpenSSL|x64 + ReleaseOpenSSL|x86 = ReleaseOpenSSL|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1F891260-2039-494F-9777-EC5166AF31BC}.Debug|ARM.ActiveCfg = Debug|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x64.ActiveCfg = Debug|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x64.Build.0 = Debug|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x86.ActiveCfg = Debug|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.DebugOpenSSL|ARM.ActiveCfg = DebugOpenSSL|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.DebugOpenSSL|x64.ActiveCfg = DebugOpenSSL|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.DebugOpenSSL|x64.Build.0 = DebugOpenSSL|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.DebugOpenSSL|x86.ActiveCfg = DebugOpenSSL|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Release|ARM.ActiveCfg = Release|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Release|x64.ActiveCfg = Release|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Release|x64.Build.0 = Release|x64 {1F891260-2039-494F-9777-EC5166AF31BC}.Release|x86.ActiveCfg = Release|x64 - {18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|ARM.ActiveCfg = Debug|x64 - {18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x64.ActiveCfg = Debug|x64 - {18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x86.ActiveCfg = Debug|x64 - {18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|ARM.ActiveCfg = Release|x64 - {18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x64.ActiveCfg = Release|x64 - {18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x86.ActiveCfg = Release|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.ReleaseOpenSSL|ARM.ActiveCfg = ReleaseOpenSSL|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.ReleaseOpenSSL|x64.ActiveCfg = ReleaseOpenSSL|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.ReleaseOpenSSL|x64.Build.0 = ReleaseOpenSSL|x64 + {1F891260-2039-494F-9777-EC5166AF31BC}.ReleaseOpenSSL|x86.ActiveCfg = ReleaseOpenSSL|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win/ovpn3-core.vcxproj b/win/ovpn3-core.vcxproj index f49f2266..06cf127f 100644 --- a/win/ovpn3-core.vcxproj +++ b/win/ovpn3-core.vcxproj @@ -1,10 +1,18 @@  + + DebugOpenSSL + x64 + Debug x64 + + ReleaseOpenSSL + x64 + Release x64 @@ -447,6 +455,12 @@ MultiByte v141 + + Application + true + MultiByte + v141 + Application false @@ -454,6 +468,13 @@ true MultiByte + + Application + false + v141 + true + MultiByte + @@ -480,6 +501,25 @@ NotSet + + + TurnOffAllWarnings + Disabled + false + _CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_OPENSSL;HAVE_LZ4;TAP_WIN_COMPONENT_ID=tap0901;%(PreprocessorDefinitions) + $(O3)\deps\amd64\openssl\inc32;$(O3)\deps\amd64\tap-windows\src;$(O3)\deps\amd64\asio\asio\include;$(O3)\deps\amd64\lz4\lib;$(O3)\core;%(AdditionalIncludeDirectories) + false + ProgramDatabase + /bigobj %(AdditionalOptions) + MultiThreadedDebug + + + true + $(O3)\deps\amd64\openssl\out32;$(O3)\deps\amd64\lz4\lib;%(AdditionalLibraryDirectories) + gdi32.lib;user32.lib;ssleay32.lib;libeay32.lib;lz4.lib;fwpuclnt.lib;ws2_32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;advapi32.lib;wininet.lib;shell32.lib;ole32.lib;rpcrt4.lib;Wtsapi32.lib + NotSet + + TurnOffAllWarnings @@ -499,7 +539,26 @@ lz4.lib;mbedtls.lib;fwpuclnt.lib;ws2_32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;advapi32.lib;wininet.lib;shell32.lib;ole32.lib;rpcrt4.lib;Wtsapi32.lib;%(AdditionalDependencies) + + + TurnOffAllWarnings + MaxSpeed + true + true + false + _CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_OPENSSL;HAVE_LZ4;TAP_WIN_COMPONENT_ID=tap0901;%(PreprocessorDefinitions) + $(O3)\deps\amd64\openssl\inc32;$(O3)\deps\amd64\tap-windows\src;$(O3)\deps\amd64\asio\asio\include;$(O3)\deps\amd64\lz4\lib;$(O3)\core;%(AdditionalIncludeDirectories) + MultiThreaded + + + true + true + true + $(O3)\deps\amd64\openssl\out32;$(O3)\deps\amd64\lz4\lib;%(AdditionalLibraryDirectories) + ssleay32.lib;libeay32.lib;lz4.lib;fwpuclnt.lib;ws2_32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;advapi32.lib;wininet.lib;shell32.lib;ole32.lib;rpcrt4.lib;Wtsapi32.lib;%(AdditionalDependencies) + + - + \ No newline at end of file