Skip to content

Commit 89b5fbc

Browse files
committed
acl 3.0.22 版本发布
1 parent 9077ac9 commit 89b5fbc

28 files changed

+543
-77
lines changed

acl_cpp_vc2012.sln

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples_protocol", "samples
266266
EndProject
267267
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgi", "lib_acl_cpp\samples\cgi\cgi_vc2012.vcxproj", "{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}"
268268
EndProject
269+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aio_server_ssl", "lib_acl_cpp\samples\aio\aio_server_ssl\aio_server_ssl_vc2012.vcxproj", "{A07145B7-36AE-4D6F-8536-30A8BE48529D}"
270+
ProjectSection(ProjectDependencies) = postProject
271+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
272+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
273+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
274+
EndProjectSection
275+
EndProject
276+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aio_client_ssl", "lib_acl_cpp\samples\aio\aio_client_ssl\aio_client_ssl_vc2012.vcxproj", "{95F01BE0-DD1D-4671-8C22-BD420917401B}"
277+
ProjectSection(ProjectDependencies) = postProject
278+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
279+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
280+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
281+
EndProjectSection
282+
EndProject
269283
Global
270284
GlobalSection(SolutionConfigurationPlatforms) = preSolution
271285
Debug|Win32 = Debug|Win32
@@ -970,6 +984,36 @@ Global
970984
{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}.Template|Win32.ActiveCfg = DebugDll|Win32
971985
{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}.Template|Win32.Build.0 = DebugDll|Win32
972986
{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}.Template|x64.ActiveCfg = DebugDll|Win32
987+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Debug|Win32.ActiveCfg = Debug|Win32
988+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Debug|Win32.Build.0 = Debug|Win32
989+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Debug|x64.ActiveCfg = Debug|Win32
990+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
991+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.DebugDll|Win32.Build.0 = DebugDll|Win32
992+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.DebugDll|x64.ActiveCfg = DebugDll|Win32
993+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Release|Win32.ActiveCfg = Release|Win32
994+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Release|Win32.Build.0 = Release|Win32
995+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Release|x64.ActiveCfg = Release|Win32
996+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
997+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Releasedll|Win32.Build.0 = Releasedll|Win32
998+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Releasedll|x64.ActiveCfg = Releasedll|Win32
999+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Template|Win32.ActiveCfg = DebugDll|Win32
1000+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Template|Win32.Build.0 = DebugDll|Win32
1001+
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Template|x64.ActiveCfg = DebugDll|Win32
1002+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Debug|Win32.ActiveCfg = Debug|Win32
1003+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Debug|Win32.Build.0 = Debug|Win32
1004+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Debug|x64.ActiveCfg = Debug|Win32
1005+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
1006+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.DebugDll|Win32.Build.0 = DebugDll|Win32
1007+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.DebugDll|x64.ActiveCfg = DebugDll|Win32
1008+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Release|Win32.ActiveCfg = Release|Win32
1009+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Release|Win32.Build.0 = Release|Win32
1010+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Release|x64.ActiveCfg = Release|Win32
1011+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
1012+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Releasedll|Win32.Build.0 = Releasedll|Win32
1013+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Releasedll|x64.ActiveCfg = Releasedll|Win32
1014+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Template|Win32.ActiveCfg = DebugDll|Win32
1015+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Template|Win32.Build.0 = DebugDll|Win32
1016+
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Template|x64.ActiveCfg = DebugDll|Win32
9731017
EndGlobalSection
9741018
GlobalSection(SolutionProperties) = preSolution
9751019
HideSolutionNode = FALSE
@@ -998,6 +1042,8 @@ Global
9981042
{ADE6F714-BD52-432D-AB86-62FA59AB6746} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
9991043
{9A04F86E-D4CB-45ED-9BB6-9939B9400B6F} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
10001044
{BE2DF8B2-2DCD-4F32-99B9-0B0CA24BFAD9} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
1045+
{A07145B7-36AE-4D6F-8536-30A8BE48529D} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
1046+
{95F01BE0-DD1D-4671-8C22-BD420917401B} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
10011047
{41FA5224-3315-4CDA-9C44-19085049F179} = {716AA69D-C8D2-4274-8207-A384FC20EAF0}
10021048
{7680672C-4C9B-4BE8-8BAE-BB23B951AAA0} = {716AA69D-C8D2-4274-8207-A384FC20EAF0}
10031049
{C0A7DB86-EF13-4A3E-9F34-8950521C9675} = {F1ABE59F-D95A-4CD5-92A2-6A1622E63BAB}

changes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
�޸���ʷ�б���
22
------------------------------------------------------------------------
3+
78) 2014.12.14 --- acl 3.0.22 �汾������
34
77) 2014.12.1
45
77.1) �������̣������Ӱ����ܽ��з���
56

lib_acl_cpp/lib_acl_cpp_vc2003.vcproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
335335
<File
336336
RelativePath=".\src\stream\socket_stream.cpp">
337337
</File>
338-
<File
339-
RelativePath=".\src\stream\ssl_aio_stream.cpp">
340-
</File>
341338
<File
342339
RelativePath=".\src\stream\stream.cpp">
343340
</File>
@@ -855,9 +852,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
855852
<File
856853
RelativePath=".\include\acl_cpp\stream\socket_stream.hpp">
857854
</File>
858-
<File
859-
RelativePath=".\include\acl_cpp\stream\ssl_aio_stream.hpp">
860-
</File>
861855
<File
862856
RelativePath=".\include\acl_cpp\stream\stream.hpp">
863857
</File>

lib_acl_cpp/lib_acl_cpp_vc2008.vcproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -961,10 +961,6 @@
961961
RelativePath=".\src\stream\socket_stream.cpp"
962962
>
963963
</File>
964-
<File
965-
RelativePath=".\src\stream\ssl_aio_stream.cpp"
966-
>
967-
</File>
968964
<File
969965
RelativePath=".\src\stream\stream.cpp"
970966
>
@@ -1503,10 +1499,6 @@
15031499
RelativePath=".\include\acl_cpp\stream\socket_stream.hpp"
15041500
>
15051501
</File>
1506-
<File
1507-
RelativePath=".\include\acl_cpp\stream\ssl_aio_stream.hpp"
1508-
>
1509-
</File>
15101502
<File
15111503
RelativePath=".\include\acl_cpp\stream\stream.hpp"
15121504
>

lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
324324
<ClCompile Include="src\stream\polarssl_io.cpp" />
325325
<ClCompile Include="src\stream\server_socket.cpp" />
326326
<ClCompile Include="src\stream\socket_stream.cpp" />
327-
<ClCompile Include="src\stream\ssl_aio_stream.cpp" />
328327
<ClCompile Include="src\stream\stream.cpp" />
329328
</ItemGroup>
330329
<ItemGroup>
@@ -444,7 +443,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
444443
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp" />
445444
<ClInclude Include="include\acl_cpp\stream\server_socket.hpp" />
446445
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp" />
447-
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp" />
448446
<ClInclude Include="include\acl_cpp\stream\stream.hpp" />
449447
<ClInclude Include="include\acl_cpp\stream\stream_hook.hpp" />
450448
<ClInclude Include="resource_vc2010.h" />

lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,6 @@
190190
<ClCompile Include="src\stream\socket_stream.cpp">
191191
<Filter>src\stream</Filter>
192192
</ClCompile>
193-
<ClCompile Include="src\stream\ssl_aio_stream.cpp">
194-
<Filter>src\stream</Filter>
195-
</ClCompile>
196193
<ClCompile Include="src\mime\internal\header_opts.cpp">
197194
<Filter>src\mime\internal</Filter>
198195
</ClCompile>
@@ -687,9 +684,6 @@
687684
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp">
688685
<Filter>include\stream</Filter>
689686
</ClInclude>
690-
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp">
691-
<Filter>include\stream</Filter>
692-
</ClInclude>
693687
<ClInclude Include="include\acl_cpp\lib_acl.hpp">
694688
<Filter>include</Filter>
695689
</ClInclude>

lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
328328
<ClCompile Include="src\stream\polarssl_io.cpp" />
329329
<ClCompile Include="src\stream\server_socket.cpp" />
330330
<ClCompile Include="src\stream\socket_stream.cpp" />
331-
<ClCompile Include="src\stream\ssl_aio_stream.cpp" />
332331
<ClCompile Include="src\stream\stream.cpp" />
333332
</ItemGroup>
334333
<ItemGroup>
@@ -450,7 +449,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
450449
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp" />
451450
<ClInclude Include="include\acl_cpp\stream\server_socket.hpp" />
452451
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp" />
453-
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp" />
454452
<ClInclude Include="include\acl_cpp\stream\stream.hpp" />
455453
<ClInclude Include="include\acl_cpp\stream\stream_hook.hpp" />
456454
<ClInclude Include="resource_vc2012.h" />

lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@
187187
<ClCompile Include="src\stream\socket_stream.cpp">
188188
<Filter>src\stream</Filter>
189189
</ClCompile>
190-
<ClCompile Include="src\stream\ssl_aio_stream.cpp">
191-
<Filter>src\stream</Filter>
192-
</ClCompile>
193190
<ClCompile Include="src\mime\internal\header_opts.cpp">
194191
<Filter>src\mime\internal</Filter>
195192
</ClCompile>
@@ -678,9 +675,6 @@
678675
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp">
679676
<Filter>include\stream</Filter>
680677
</ClInclude>
681-
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp">
682-
<Filter>include\stream</Filter>
683-
</ClInclude>
684678
<ClInclude Include="include\acl_cpp\lib_acl.hpp">
685679
<Filter>include</Filter>
686680
</ClInclude>

lib_acl_cpp/samples/aio/aio_client_ssl/aio_client_ssl_vc2012.vcxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
22-
<ProjectGuid>{9A04F86E-D4CB-45ED-9BB6-9939B9400B6F}</ProjectGuid>
22+
<ProjectGuid>{95F01BE0-DD1D-4671-8C22-BD420917401B}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<ProjectName>aio_client_ssl</ProjectName>
2525
</PropertyGroup>
@@ -109,7 +109,7 @@
109109
<TargetMachine>MachineX86</TargetMachine>
110110
<IgnoreSpecificDefaultLibraries>
111111
</IgnoreSpecificDefaultLibraries>
112-
<AdditionalDependencies>lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
112+
<AdditionalDependencies>lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
113113
</Link>
114114
</ItemDefinitionGroup>
115115
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -123,9 +123,9 @@
123123
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
124124
</ClCompile>
125125
<Link>
126-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
126+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
127127
<OutputFile>$(OutDir)aio_client_ssl.exe</OutputFile>
128-
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
128+
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
129129
<GenerateDebugInformation>true</GenerateDebugInformation>
130130
<SubSystem>Console</SubSystem>
131131
<OptimizeReferences>true</OptimizeReferences>
@@ -149,9 +149,9 @@
149149
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
150150
</ClCompile>
151151
<Link>
152-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
152+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
153153
<OutputFile>$(OutDir)aio_client_ssl.exe</OutputFile>
154-
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
154+
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155155
<GenerateDebugInformation>true</GenerateDebugInformation>
156156
<ProgramDatabaseFile>$(OutDir)aio_client_ssl.pdb</ProgramDatabaseFile>
157157
<SubSystem>Console</SubSystem>
@@ -172,9 +172,9 @@
172172
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
173173
</ClCompile>
174174
<Link>
175-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
175+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
176176
<OutputFile>$(OutDir)aio_client_ssl.exe</OutputFile>
177-
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
177+
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178178
<IgnoreSpecificDefaultLibraries>libcmt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
179179
<GenerateDebugInformation>true</GenerateDebugInformation>
180180
<ProgramDatabaseFile>$(OutDir)aio_client_ssl.pdb</ProgramDatabaseFile>
@@ -192,4 +192,4 @@
192192
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
193193
<ImportGroup Label="ExtensionTargets">
194194
</ImportGroup>
195-
</Project>
195+
</Project>

lib_acl_cpp/samples/aio/aio_server_ssl/aio_server_ssl_vc2012.vcxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
22-
<ProjectGuid>{225D0BFA-64D7-4F8F-951E-36A494CF6178}</ProjectGuid>
22+
<ProjectGuid>{A07145B7-36AE-4D6F-8536-30A8BE48529D}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<ProjectName>aio_server_ssl</ProjectName>
2525
</PropertyGroup>
@@ -101,7 +101,7 @@
101101
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
102102
</ClCompile>
103103
<Link>
104-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
104+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
105105
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
106106
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
107107
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -123,9 +123,9 @@
123123
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
124124
</ClCompile>
125125
<Link>
126-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
126+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
127127
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
128-
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
128+
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
129129
<GenerateDebugInformation>true</GenerateDebugInformation>
130130
<SubSystem>Console</SubSystem>
131131
<OptimizeReferences>true</OptimizeReferences>
@@ -149,9 +149,9 @@
149149
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
150150
</ClCompile>
151151
<Link>
152-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
152+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
153153
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
154-
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
154+
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155155
<GenerateDebugInformation>true</GenerateDebugInformation>
156156
<ProgramDatabaseFile>$(OutDir)aio_server_ssl.pdb</ProgramDatabaseFile>
157157
<SubSystem>Console</SubSystem>
@@ -172,9 +172,9 @@
172172
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
173173
</ClCompile>
174174
<Link>
175-
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
175+
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
176176
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
177-
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
177+
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178178
<GenerateDebugInformation>true</GenerateDebugInformation>
179179
<ProgramDatabaseFile>$(OutDir)aio_server_ssl.pdb</ProgramDatabaseFile>
180180
<SubSystem>Console</SubSystem>
@@ -191,4 +191,4 @@
191191
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
192192
<ImportGroup Label="ExtensionTargets">
193193
</ImportGroup>
194-
</Project>
194+
</Project>

0 commit comments

Comments
 (0)