Skip to content

Commit

Permalink
acl 3.0.22 版本发布
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengshuxin committed Dec 14, 2014
1 parent 9077ac9 commit 89b5fbc
Show file tree
Hide file tree
Showing 28 changed files with 543 additions and 77 deletions.
46 changes: 46 additions & 0 deletions acl_cpp_vc2012.sln
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples_protocol", "samples
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgi", "lib_acl_cpp\samples\cgi\cgi_vc2012.vcxproj", "{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}"
EndProject
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}"
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("{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}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -970,6 +984,36 @@ Global
{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}.Template|Win32.ActiveCfg = DebugDll|Win32
{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}.Template|Win32.Build.0 = DebugDll|Win32
{2C2212C1-01D2-4C8E-AB15-F7E31C7C134B}.Template|x64.ActiveCfg = DebugDll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Debug|Win32.ActiveCfg = Debug|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Debug|Win32.Build.0 = Debug|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Debug|x64.ActiveCfg = Debug|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.DebugDll|Win32.Build.0 = DebugDll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.DebugDll|x64.ActiveCfg = DebugDll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Release|Win32.ActiveCfg = Release|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Release|Win32.Build.0 = Release|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Release|x64.ActiveCfg = Release|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Releasedll|Win32.Build.0 = Releasedll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Releasedll|x64.ActiveCfg = Releasedll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Template|Win32.ActiveCfg = DebugDll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Template|Win32.Build.0 = DebugDll|Win32
{A07145B7-36AE-4D6F-8536-30A8BE48529D}.Template|x64.ActiveCfg = DebugDll|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Debug|Win32.ActiveCfg = Debug|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Debug|Win32.Build.0 = Debug|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Debug|x64.ActiveCfg = Debug|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.DebugDll|Win32.Build.0 = DebugDll|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.DebugDll|x64.ActiveCfg = DebugDll|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Release|Win32.ActiveCfg = Release|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Release|Win32.Build.0 = Release|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Release|x64.ActiveCfg = Release|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Releasedll|Win32.Build.0 = Releasedll|Win32
{95F01BE0-DD1D-4671-8C22-BD420917401B}.Releasedll|x64.ActiveCfg = Releasedll|Win32
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -998,6 +1042,8 @@ Global
{ADE6F714-BD52-432D-AB86-62FA59AB6746} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
{9A04F86E-D4CB-45ED-9BB6-9939B9400B6F} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
{BE2DF8B2-2DCD-4F32-99B9-0B0CA24BFAD9} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
{A07145B7-36AE-4D6F-8536-30A8BE48529D} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
{95F01BE0-DD1D-4671-8C22-BD420917401B} = {02535D96-1693-4AA3-B650-B22DC776FDC2}
{41FA5224-3315-4CDA-9C44-19085049F179} = {716AA69D-C8D2-4274-8207-A384FC20EAF0}
{7680672C-4C9B-4BE8-8BAE-BB23B951AAA0} = {716AA69D-C8D2-4274-8207-A384FC20EAF0}
{C0A7DB86-EF13-4A3E-9F34-8950521C9675} = {F1ABE59F-D95A-4CD5-92A2-6A1622E63BAB}
Expand Down
1 change: 1 addition & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
�޸���ʷ�б���
------------------------------------------------------------------------
78) 2014.12.14 --- acl 3.0.22 �汾������
77) 2014.12.1
77.1) �������̣������Ӱ����ܽ��з���

Expand Down
6 changes: 0 additions & 6 deletions lib_acl_cpp/lib_acl_cpp_vc2003.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<File
RelativePath=".\src\stream\socket_stream.cpp">
</File>
<File
RelativePath=".\src\stream\ssl_aio_stream.cpp">
</File>
<File
RelativePath=".\src\stream\stream.cpp">
</File>
Expand Down Expand Up @@ -855,9 +852,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<File
RelativePath=".\include\acl_cpp\stream\socket_stream.hpp">
</File>
<File
RelativePath=".\include\acl_cpp\stream\ssl_aio_stream.hpp">
</File>
<File
RelativePath=".\include\acl_cpp\stream\stream.hpp">
</File>
Expand Down
8 changes: 0 additions & 8 deletions lib_acl_cpp/lib_acl_cpp_vc2008.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -961,10 +961,6 @@
RelativePath=".\src\stream\socket_stream.cpp"
>
</File>
<File
RelativePath=".\src\stream\ssl_aio_stream.cpp"
>
</File>
<File
RelativePath=".\src\stream\stream.cpp"
>
Expand Down Expand Up @@ -1503,10 +1499,6 @@
RelativePath=".\include\acl_cpp\stream\socket_stream.hpp"
>
</File>
<File
RelativePath=".\include\acl_cpp\stream\ssl_aio_stream.hpp"
>
</File>
<File
RelativePath=".\include\acl_cpp\stream\stream.hpp"
>
Expand Down
2 changes: 0 additions & 2 deletions lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<ClCompile Include="src\stream\polarssl_io.cpp" />
<ClCompile Include="src\stream\server_socket.cpp" />
<ClCompile Include="src\stream\socket_stream.cpp" />
<ClCompile Include="src\stream\ssl_aio_stream.cpp" />
<ClCompile Include="src\stream\stream.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -444,7 +443,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp" />
<ClInclude Include="include\acl_cpp\stream\server_socket.hpp" />
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\stream_hook.hpp" />
<ClInclude Include="resource_vc2010.h" />
Expand Down
6 changes: 0 additions & 6 deletions lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,6 @@
<ClCompile Include="src\stream\socket_stream.cpp">
<Filter>src\stream</Filter>
</ClCompile>
<ClCompile Include="src\stream\ssl_aio_stream.cpp">
<Filter>src\stream</Filter>
</ClCompile>
<ClCompile Include="src\mime\internal\header_opts.cpp">
<Filter>src\mime\internal</Filter>
</ClCompile>
Expand Down Expand Up @@ -687,9 +684,6 @@
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp">
<Filter>include\stream</Filter>
</ClInclude>
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp">
<Filter>include\stream</Filter>
</ClInclude>
<ClInclude Include="include\acl_cpp\lib_acl.hpp">
<Filter>include</Filter>
</ClInclude>
Expand Down
2 changes: 0 additions & 2 deletions lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<ClCompile Include="src\stream\polarssl_io.cpp" />
<ClCompile Include="src\stream\server_socket.cpp" />
<ClCompile Include="src\stream\socket_stream.cpp" />
<ClCompile Include="src\stream\ssl_aio_stream.cpp" />
<ClCompile Include="src\stream\stream.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -450,7 +449,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp" />
<ClInclude Include="include\acl_cpp\stream\server_socket.hpp" />
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\stream_hook.hpp" />
<ClInclude Include="resource_vc2012.h" />
Expand Down
6 changes: 0 additions & 6 deletions lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,6 @@
<ClCompile Include="src\stream\socket_stream.cpp">
<Filter>src\stream</Filter>
</ClCompile>
<ClCompile Include="src\stream\ssl_aio_stream.cpp">
<Filter>src\stream</Filter>
</ClCompile>
<ClCompile Include="src\mime\internal\header_opts.cpp">
<Filter>src\mime\internal</Filter>
</ClCompile>
Expand Down Expand Up @@ -678,9 +675,6 @@
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp">
<Filter>include\stream</Filter>
</ClInclude>
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp">
<Filter>include\stream</Filter>
</ClInclude>
<ClInclude Include="include\acl_cpp\lib_acl.hpp">
<Filter>include</Filter>
</ClInclude>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9A04F86E-D4CB-45ED-9BB6-9939B9400B6F}</ProjectGuid>
<ProjectGuid>{95F01BE0-DD1D-4671-8C22-BD420917401B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<ProjectName>aio_client_ssl</ProjectName>
</PropertyGroup>
Expand Down Expand Up @@ -109,7 +109,7 @@
<TargetMachine>MachineX86</TargetMachine>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
<AdditionalDependencies>lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -123,9 +123,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_client_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Expand All @@ -149,9 +149,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_client_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)aio_client_ssl.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Expand All @@ -172,9 +172,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_client_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)aio_client_ssl.pdb</ProgramDatabaseFile>
Expand All @@ -192,4 +192,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{225D0BFA-64D7-4F8F-951E-36A494CF6178}</ProjectGuid>
<ProjectGuid>{A07145B7-36AE-4D6F-8536-30A8BE48529D}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<ProjectName>aio_server_ssl</ProjectName>
</PropertyGroup>
Expand Down Expand Up @@ -101,7 +101,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -123,9 +123,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Expand All @@ -149,9 +149,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)aio_server_ssl.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Expand All @@ -172,9 +172,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;lib_acl.lib;lib_acl_cpp.lib;polarssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)aio_server_ssl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)aio_server_ssl.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Expand All @@ -191,4 +191,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion lib_acl_cpp/samples/aio/ssl_aio_client/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "acl_cpp/stdlib/string.hpp"
#include "acl_cpp/http/http_header.hpp"
#include "acl_cpp/stream/aio_handle.hpp"
#include "acl_cpp/stream/ssl_aio_stream.hpp"
#include "ssl_aio_stream.hpp"

#ifdef WIN32
# ifndef snprintf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="polarssl.lib"
OutputFile="$(OutDir)/ssl_aio_client.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\lib\win32"
Expand Down Expand Up @@ -345,12 +346,20 @@
RelativePath=".\main.cpp"
>
</File>
<File
RelativePath=".\ssl_aio_stream.cpp"
>
</File>
</Filter>
<Filter
Name="Í·Îļþ"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\ssl_aio_stream.hpp"
>
</File>
</Filter>
<Filter
Name="×ÊÔ´Îļþ"
Expand Down
Loading

0 comments on commit 89b5fbc

Please sign in to comment.