From d4313ab4f6da64cd8067dcc68bcd1934aafd1df5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Aug 2020 18:14:31 +0800 Subject: [PATCH] fixed some compiling error by vc2015 --- acl_cpp_vc2015.sln | 33 ------------------- app/gson/demo/demo.vcxproj | 3 ++ app/gson/gson.vcxproj | 4 +++ app/net_tools/net_tools_vc2015.vcxproj | 4 +-- .../aio_client_ssl_vc2015.vcxproj | 10 +++--- .../aio_server_ssl_vc2015.vcxproj | 10 +++--- .../mysql_manager_vc2015.vcxproj | 4 +-- .../db/mysql_pool/mysql_pool_vc2015.vcxproj | 4 +-- .../db/mysql_query/mysql_query_vc2015.vcxproj | 4 +-- lib_acl_cpp/samples/md5/md5_vc2015.vcxproj | 10 +++--- .../https_proxy/https_proxy_vc2015.vcxproj | 10 +++--- .../ssl/ssl_client/ssl_client_vc2015.vcxproj | 10 +++--- .../ssl/ssl_server/ssl_server_vc2015.vcxproj | 10 +++--- 13 files changed, 45 insertions(+), 71 deletions(-) diff --git a/acl_cpp_vc2015.sln b/acl_cpp_vc2015.sln index c971bc649..aafc547ae 100644 --- a/acl_cpp_vc2015.sln +++ b/acl_cpp_vc2015.sln @@ -308,13 +308,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{3CC8D45A-8E3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "master_dispatch", "master_dispatch", "{D232833B-57A9-4167-B37C-A4594953F93D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dispatch_manager", "app\master_dispatch\manager\dispatch_manager_vc2015.vcxproj", "{B59C7CB6-5708-4522-B833-CEB160AA4817}" - ProjectSection(ProjectDependencies) = postProject - {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} - {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} - {FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xml", "xml", "{C799E376-2F01-4877-AF18-7F3CC8B95792}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml1", "lib_acl_cpp\samples\xml\xml1\xml1_vc2015.vcxproj", "{2DABFAD1-114B-4F96-9185-DC0C56A3662D}" @@ -1939,31 +1932,6 @@ Global {95F01BE0-DD1D-4671-8C22-BD420917401B}.Template|Win32.ActiveCfg = DebugDll|Win32 {95F01BE0-DD1D-4671-8C22-BD420917401B}.Template|Win32.Build.0 = DebugDll|Win32 {95F01BE0-DD1D-4671-8C22-BD420917401B}.Template|x64.ActiveCfg = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Debug|Win32.ActiveCfg = Debug|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Debug|Win32.Build.0 = Debug|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Debug|x64.ActiveCfg = Debug|x64 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.DebugDll|x64.ActiveCfg = DebugDll|x64 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Release|Mixed Platforms.Build.0 = Release|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Release|Win32.ActiveCfg = Release|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Release|Win32.Build.0 = Release|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Release|x64.ActiveCfg = Release|x64 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Releasedll|Win32.Build.0 = ReleaseDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Releasedll|x64.ActiveCfg = ReleaseDll|x64 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Template|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Template|Mixed Platforms.Build.0 = ReleaseDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Template|Win32.ActiveCfg = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Template|Win32.Build.0 = DebugDll|Win32 - {B59C7CB6-5708-4522-B833-CEB160AA4817}.Template|x64.ActiveCfg = DebugDll|Win32 {2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -3693,7 +3661,6 @@ Global {A07145B7-36AE-4D6F-8536-30A8BE48529D} = {02535D96-1693-4AA3-B650-B22DC776FDC2} {95F01BE0-DD1D-4671-8C22-BD420917401B} = {02535D96-1693-4AA3-B650-B22DC776FDC2} {D232833B-57A9-4167-B37C-A4594953F93D} = {3CC8D45A-8E3F-4F5C-A7DF-4D8027E4EA9C} - {B59C7CB6-5708-4522-B833-CEB160AA4817} = {D232833B-57A9-4167-B37C-A4594953F93D} {C799E376-2F01-4877-AF18-7F3CC8B95792} = {324E7B70-E11C-4A39-A11F-4BB2A8E70064} {2DABFAD1-114B-4F96-9185-DC0C56A3662D} = {C799E376-2F01-4877-AF18-7F3CC8B95792} {3EA9D02E-FF89-4AF3-A842-EB84DC76DD2A} = {C799E376-2F01-4877-AF18-7F3CC8B95792} diff --git a/app/gson/demo/demo.vcxproj b/app/gson/demo/demo.vcxproj index c9c4309e4..872e54d96 100644 --- a/app/gson/demo/demo.vcxproj +++ b/app/gson/demo/demo.vcxproj @@ -97,10 +97,13 @@ true true true + $(SolutionDir)lib_acl_cpp\include;$(SolutionDir)lib_acl\include;./include;%(AdditionalIncludeDirectories) true true + $(SolutionDir)\lib_acl_cpp;$(SolutionDir)\lib_acl;%(AdditionalLibraryDirectories) + lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) diff --git a/app/gson/gson.vcxproj b/app/gson/gson.vcxproj index c1922a19f..ff51556a1 100644 --- a/app/gson/gson.vcxproj +++ b/app/gson/gson.vcxproj @@ -98,10 +98,14 @@ true true true + $(SolutionDir)lib_acl_cpp\include;$(SolutionDir)lib_acl\include;./include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_WIN32;_MBCS;%(PreprocessorDefinitions) true true + $(SolutionDir)lib_acl_cpp;$(SolutionDir)lib_acl;%(AdditionalLibraryDirectories) + lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) diff --git a/app/net_tools/net_tools_vc2015.vcxproj b/app/net_tools/net_tools_vc2015.vcxproj index 1a380dbc3..1d1ae2b69 100644 --- a/app/net_tools/net_tools_vc2015.vcxproj +++ b/app/net_tools/net_tools_vc2015.vcxproj @@ -124,7 +124,7 @@ copy ..\..\lib\win32\sqlite3.dll $(OutDir) /Y $(IntDir);%(AdditionalIncludeDirectories) - uxtheme.lib;polarssl.lib;Iphlpapi.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib;%(AdditionalDependencies) + uxtheme.lib;Iphlpapi.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib;%(AdditionalDependencies) ..\..\lib\win32;..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libc;%(IgnoreSpecificDefaultLibraries) true @@ -248,4 +248,4 @@ copy ..\..\lib\win32\sqlite3.dll $(OutDir) /Y - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/aio/aio_client_ssl/aio_client_ssl_vc2015.vcxproj b/lib_acl_cpp/samples/aio/aio_client_ssl/aio_client_ssl_vc2015.vcxproj index 6735ba005..96e241dec 100644 --- a/lib_acl_cpp/samples/aio/aio_client_ssl/aio_client_ssl_vc2015.vcxproj +++ b/lib_acl_cpp/samples/aio/aio_client_ssl/aio_client_ssl_vc2015.vcxproj @@ -173,7 +173,7 @@ MachineX86 - lib_acl_vc2015d.lib;lib_acl_cpp_vc2015d.lib;polarssl.lib;%(AdditionalDependencies) + lib_acl_vc2015d.lib;lib_acl_cpp_vc2015d.lib;%(AdditionalDependencies) @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)aio_client_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -258,7 +258,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies) $(OutDir)aio_client_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -302,7 +302,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;%(AdditionalDependencies) $(OutDir)aio_client_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) @@ -348,4 +348,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/aio/aio_server_ssl/aio_server_ssl_vc2015.vcxproj b/lib_acl_cpp/samples/aio/aio_server_ssl/aio_server_ssl_vc2015.vcxproj index ad5a220cb..5c597ce0d 100644 --- a/lib_acl_cpp/samples/aio/aio_server_ssl/aio_server_ssl_vc2015.vcxproj +++ b/lib_acl_cpp/samples/aio/aio_server_ssl/aio_server_ssl_vc2015.vcxproj @@ -165,7 +165,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_vc2015d.lib;lib_acl_cpp_vc2015d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_vc2015d.lib;lib_acl_cpp_vc2015d.lib;%(AdditionalDependencies) $(OutDir)aio_server_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)aio_server_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -258,7 +258,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies) $(OutDir)aio_server_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -302,7 +302,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;%(AdditionalDependencies) $(OutDir)aio_server_ssl.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -346,4 +346,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/db/mysql_manager/mysql_manager_vc2015.vcxproj b/lib_acl_cpp/samples/db/mysql_manager/mysql_manager_vc2015.vcxproj index 0e7b3f9a9..b5ab6e842 100644 --- a/lib_acl_cpp/samples/db/mysql_manager/mysql_manager_vc2015.vcxproj +++ b/lib_acl_cpp/samples/db/mysql_manager/mysql_manager_vc2015.vcxproj @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;libmysql.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)mysql_manager.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -348,4 +348,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/db/mysql_pool/mysql_pool_vc2015.vcxproj b/lib_acl_cpp/samples/db/mysql_pool/mysql_pool_vc2015.vcxproj index 08c41c897..22c216726 100644 --- a/lib_acl_cpp/samples/db/mysql_pool/mysql_pool_vc2015.vcxproj +++ b/lib_acl_cpp/samples/db/mysql_pool/mysql_pool_vc2015.vcxproj @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;libmysql.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)mysql_pool.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -348,4 +348,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/db/mysql_query/mysql_query_vc2015.vcxproj b/lib_acl_cpp/samples/db/mysql_query/mysql_query_vc2015.vcxproj index e7eff05a8..0c618dcb2 100644 --- a/lib_acl_cpp/samples/db/mysql_query/mysql_query_vc2015.vcxproj +++ b/lib_acl_cpp/samples/db/mysql_query/mysql_query_vc2015.vcxproj @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;libmysql.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)mysql_query.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) true @@ -348,4 +348,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/md5/md5_vc2015.vcxproj b/lib_acl_cpp/samples/md5/md5_vc2015.vcxproj index 2e480f94b..391633522 100644 --- a/lib_acl_cpp/samples/md5/md5_vc2015.vcxproj +++ b/lib_acl_cpp/samples/md5/md5_vc2015.vcxproj @@ -154,7 +154,7 @@ Disabled - ..\..\include;%(AdditionalIncludeDirectories) + ..\..\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -195,7 +195,7 @@ - ..\..\include;%(AdditionalIncludeDirectories) + ..\..\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Use @@ -235,7 +235,7 @@ Disabled - ..\..\include;%(AdditionalIncludeDirectories) + ..\..\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ACL_CPP_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -284,7 +284,7 @@ - ..\..\include;%(AdditionalIncludeDirectories) + ..\..\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;ACL_CPP_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Use @@ -353,4 +353,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/ssl/https_proxy/https_proxy_vc2015.vcxproj b/lib_acl_cpp/samples/ssl/https_proxy/https_proxy_vc2015.vcxproj index e7652fe71..9050fdfb2 100644 --- a/lib_acl_cpp/samples/ssl/https_proxy/https_proxy_vc2015.vcxproj +++ b/lib_acl_cpp/samples/ssl/https_proxy/https_proxy_vc2015.vcxproj @@ -164,7 +164,7 @@ ProgramDatabase - ws2_32.lib;lib_acl_vc2015d.lib;lib_protocol_vc2015d.lib;lib_acl_cpp_vc2015d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;lib_acl_vc2015d.lib;lib_protocol_vc2015d.lib;lib_acl_cpp_vc2015d.lib;%(AdditionalDependencies) $(OutDir)https_proxy.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libcmt;libc;%(IgnoreSpecificDefaultLibraries) @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;lib_acl_vc2015.lib;lib_protocol_vc2015.lib;lib_acl_cpp_vc2015.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;lib_acl_vc2015.lib;lib_protocol_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)https_proxy.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libc;%(IgnoreSpecificDefaultLibraries) @@ -268,7 +268,7 @@ false MachineX86 - ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies) @@ -314,7 +314,7 @@ false MachineX86 - lib_acl.lib;lib_acl_cpp.lib;lib_protocol.lib;polarssl.lib;%(AdditionalDependencies) + lib_acl.lib;lib_acl_cpp.lib;lib_protocol.lib;%(AdditionalDependencies) @@ -370,4 +370,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/ssl/ssl_client/ssl_client_vc2015.vcxproj b/lib_acl_cpp/samples/ssl/ssl_client/ssl_client_vc2015.vcxproj index 79b3f4065..39d0fb0ea 100644 --- a/lib_acl_cpp/samples/ssl/ssl_client/ssl_client_vc2015.vcxproj +++ b/lib_acl_cpp/samples/ssl/ssl_client/ssl_client_vc2015.vcxproj @@ -164,7 +164,7 @@ ProgramDatabase - ws2_32.lib;lib_acl_vc2015d.lib;lib_protocol_vc2015d.lib;lib_acl_cpp_vc2015d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;lib_acl_vc2015d.lib;lib_protocol_vc2015d.lib;lib_acl_cpp_vc2015d.lib;%(AdditionalDependencies) $(OutDir)ssl_client.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libcmt;libc;%(IgnoreSpecificDefaultLibraries) @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;lib_acl_vc2015.lib;lib_protocol_vc2015.lib;lib_acl_cpp_vc2015.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;lib_acl_vc2015.lib;lib_protocol_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)ssl_client.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libc;%(IgnoreSpecificDefaultLibraries) @@ -268,7 +268,7 @@ false MachineX86 - ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies) @@ -314,7 +314,7 @@ false MachineX86 - lib_acl.lib;lib_acl_cpp.lib;lib_protocol.lib;polarssl.lib;%(AdditionalDependencies) + lib_acl.lib;lib_acl_cpp.lib;lib_protocol.lib;%(AdditionalDependencies) @@ -361,4 +361,4 @@ - + \ No newline at end of file diff --git a/lib_acl_cpp/samples/ssl/ssl_server/ssl_server_vc2015.vcxproj b/lib_acl_cpp/samples/ssl/ssl_server/ssl_server_vc2015.vcxproj index 5f627875a..5bd78db76 100644 --- a/lib_acl_cpp/samples/ssl/ssl_server/ssl_server_vc2015.vcxproj +++ b/lib_acl_cpp/samples/ssl/ssl_server/ssl_server_vc2015.vcxproj @@ -164,7 +164,7 @@ ProgramDatabase - ws2_32.lib;lib_acl_vc2015d.lib;lib_protocol_vc2015d.lib;lib_acl_cpp_vc2015d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;lib_acl_vc2015d.lib;lib_protocol_vc2015d.lib;lib_acl_cpp_vc2015d.lib;%(AdditionalDependencies) $(OutDir)ssl_server.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libcmt;libc;%(IgnoreSpecificDefaultLibraries) @@ -210,7 +210,7 @@ ProgramDatabase - ws2_32.lib;lib_acl_vc2015.lib;lib_protocol_vc2015.lib;lib_acl_cpp_vc2015.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;lib_acl_vc2015.lib;lib_protocol_vc2015.lib;lib_acl_cpp_vc2015.lib;%(AdditionalDependencies) $(OutDir)ssl_server.exe ..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories) libc;%(IgnoreSpecificDefaultLibraries) @@ -268,7 +268,7 @@ false MachineX86 - ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies) + ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies) @@ -314,7 +314,7 @@ false MachineX86 - lib_acl.lib;lib_acl_cpp.lib;lib_protocol.lib;polarssl.lib;%(AdditionalDependencies) + lib_acl.lib;lib_acl_cpp.lib;lib_protocol.lib;%(AdditionalDependencies) @@ -361,4 +361,4 @@ - + \ No newline at end of file