Skip to content

Commit 1454b70

Browse files
author
caozhiyi
committed
modify file structure
1 parent c627646 commit 1454b70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+295
-283
lines changed

‎CppNet.vcxproj

+36-34
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<Optimization>Disabled</Optimization>
7575
<SDLCheck>true</SDLCheck>
7676
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_X86_</PreprocessorDefinitions>
77+
<AdditionalIncludeDirectories>$(SolutionDir)base;$(SolutionDir)net;$(SolutionDir)net\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7778
</ClCompile>
7879
</ItemDefinitionGroup>
7980
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -82,6 +83,7 @@
8283
<Optimization>Disabled</Optimization>
8384
<SDLCheck>true</SDLCheck>
8485
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_AMD64_</PreprocessorDefinitions>
86+
<AdditionalIncludeDirectories>$(SolutionDir)base;$(SolutionDir)net;$(SolutionDir)net\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8587
</ClCompile>
8688
<Link>
8789
<HeapReserveSize>260046848</HeapReserveSize>
@@ -114,42 +116,42 @@
114116
</Link>
115117
</ItemDefinitionGroup>
116118
<ItemGroup>
117-
<ClCompile Include="AcceptSocket.cpp" />
118-
<ClCompile Include="Buffer.cpp" />
119-
<ClCompile Include="CppNet.cpp" />
120-
<ClCompile Include="IOCP.cpp" />
121-
<ClCompile Include="Log.cpp" />
122-
<ClCompile Include="LoopBuffer.cpp" />
123-
<ClCompile Include="main.cpp" />
124-
<ClCompile Include="MemaryPool.cpp" />
125-
<ClCompile Include="OSInfo.cpp" />
126-
<ClCompile Include="Socket.cpp" />
127-
<ClCompile Include="Time.cpp" />
128-
<ClCompile Include="Timer.cpp" />
129-
<ClCompile Include="SocketBase.cpp" />
119+
<ClCompile Include="base\Buffer.cpp" />
120+
<ClCompile Include="base\Log.cpp" />
121+
<ClCompile Include="base\LoopBuffer.cpp" />
122+
<ClCompile Include="base\MemaryPool.cpp" />
123+
<ClCompile Include="base\PoolSharedPtr.cpp" />
124+
<ClCompile Include="base\TimeTool.cpp" />
125+
<ClCompile Include="net\Timer.cpp" />
126+
<ClCompile Include="net\win\AcceptSocket.cpp" />
127+
<ClCompile Include="net\win\IOCP.cpp" />
128+
<ClCompile Include="net\win\OSInfo.cpp" />
129+
<ClCompile Include="net\win\Socket.cpp" />
130+
<ClCompile Include="net\win\SocketBase.cpp" />
131+
<ClCompile Include="test\CppNet.cpp" />
130132
</ItemGroup>
131133
<ItemGroup>
132-
<ClInclude Include="AcceptSocket.h" />
133-
<ClInclude Include="Buffer.h" />
134-
<ClInclude Include="EventActions.h" />
135-
<ClInclude Include="EventHandler.h" />
136-
<ClInclude Include="IOCP.h" />
137-
<ClInclude Include="Log.h" />
138-
<ClInclude Include="LoopBuffer.h" />
139-
<ClInclude Include="MemaryPool.h" />
140-
<ClInclude Include="OSInfo.h" />
141-
<ClInclude Include="PoolSharedPtr.h" />
142-
<ClInclude Include="Runnable.h" />
143-
<ClInclude Include="RunnableAloneTaskList.h" />
144-
<ClInclude Include="RunnableAloneTaskListWithPost.h" />
145-
<ClInclude Include="RunnableShareTaskList.h" />
146-
<ClInclude Include="Single.h" />
147-
<ClInclude Include="Socket.h" />
148-
<ClInclude Include="SocketBase.h" />
149-
<ClInclude Include="TaskQueue.h" />
150-
<ClInclude Include="Time.h" />
151-
<ClInclude Include="Timer.h" />
152-
<ClInclude Include="WinExpendFunc.h" />
134+
<ClInclude Include="base\Buffer.h" />
135+
<ClInclude Include="base\Log.h" />
136+
<ClInclude Include="base\LoopBuffer.h" />
137+
<ClInclude Include="base\MemaryPool.h" />
138+
<ClInclude Include="base\PoolSharedPtr.h" />
139+
<ClInclude Include="base\Runnable.h" />
140+
<ClInclude Include="base\RunnableAloneTaskList.h" />
141+
<ClInclude Include="base\RunnableAloneTaskListWithPost.h" />
142+
<ClInclude Include="base\RunnableShareTaskList.h" />
143+
<ClInclude Include="base\Single.h" />
144+
<ClInclude Include="base\TaskQueue.h" />
145+
<ClInclude Include="base\TimeTool.h" />
146+
<ClInclude Include="net\AcceptSocket.h" />
147+
<ClInclude Include="net\EventActions.h" />
148+
<ClInclude Include="net\EventHandler.h" />
149+
<ClInclude Include="net\OSInfo.h" />
150+
<ClInclude Include="net\Socket.h" />
151+
<ClInclude Include="net\SocketBase.h" />
152+
<ClInclude Include="net\Timer.h" />
153+
<ClInclude Include="net\win\IOCP.h" />
154+
<ClInclude Include="net\win\WinExpendFunc.h" />
153155
</ItemGroup>
154156
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
155157
<ImportGroup Label="ExtensionTargets">

‎CppNet.vcxproj.filters

+49-49
Original file line numberDiff line numberDiff line change
@@ -7,117 +7,117 @@
77
<Filter Include="net">
88
<UniqueIdentifier>{d0b899ae-a8d4-4808-a5ee-64822497b537}</UniqueIdentifier>
99
</Filter>
10-
<Filter Include="net\netio">
11-
<UniqueIdentifier>{9894f839-293d-46c5-b71d-ee6fa110024c}</UniqueIdentifier>
12-
</Filter>
13-
<Filter Include="net\OS">
10+
<Filter Include="net\win">
1411
<UniqueIdentifier>{e68d38ab-7e33-4061-b30f-d8d452c83950}</UniqueIdentifier>
1512
</Filter>
13+
<Filter Include="test">
14+
<UniqueIdentifier>{da747bb7-8dad-4657-91c0-d2a6e6f4003f}</UniqueIdentifier>
15+
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="Buffer.cpp">
18+
<ClCompile Include="base\Buffer.cpp">
1919
<Filter>base</Filter>
2020
</ClCompile>
21-
<ClCompile Include="Log.cpp">
21+
<ClCompile Include="base\Log.cpp">
2222
<Filter>base</Filter>
2323
</ClCompile>
24-
<ClCompile Include="LoopBuffer.cpp">
24+
<ClCompile Include="base\LoopBuffer.cpp">
2525
<Filter>base</Filter>
2626
</ClCompile>
27-
<ClCompile Include="MemaryPool.cpp">
27+
<ClCompile Include="base\MemaryPool.cpp">
2828
<Filter>base</Filter>
2929
</ClCompile>
30-
<ClCompile Include="Time.cpp">
30+
<ClCompile Include="base\PoolSharedPtr.cpp">
3131
<Filter>base</Filter>
3232
</ClCompile>
33-
<ClCompile Include="IOCP.cpp">
34-
<Filter>net\netio</Filter>
35-
</ClCompile>
36-
<ClCompile Include="OSInfo.cpp">
33+
<ClCompile Include="base\TimeTool.cpp">
3734
<Filter>base</Filter>
3835
</ClCompile>
39-
<ClCompile Include="Timer.cpp">
40-
<Filter>net</Filter>
36+
<ClCompile Include="net\win\AcceptSocket.cpp">
37+
<Filter>net\win</Filter>
4138
</ClCompile>
42-
<ClCompile Include="main.cpp">
43-
<Filter>net</Filter>
39+
<ClCompile Include="net\win\IOCP.cpp">
40+
<Filter>net\win</Filter>
4441
</ClCompile>
45-
<ClCompile Include="CppNet.cpp">
46-
<Filter>net</Filter>
42+
<ClCompile Include="net\win\OSInfo.cpp">
43+
<Filter>net\win</Filter>
44+
</ClCompile>
45+
<ClCompile Include="net\win\Socket.cpp">
46+
<Filter>net\win</Filter>
4747
</ClCompile>
48-
<ClCompile Include="Socket.cpp">
49-
<Filter>net\OS</Filter>
48+
<ClCompile Include="net\win\SocketBase.cpp">
49+
<Filter>net\win</Filter>
5050
</ClCompile>
51-
<ClCompile Include="AcceptSocket.cpp">
52-
<Filter>net\OS</Filter>
51+
<ClCompile Include="net\Timer.cpp">
52+
<Filter>net</Filter>
5353
</ClCompile>
54-
<ClCompile Include="SocketBase.cpp">
55-
<Filter>net\OS</Filter>
54+
<ClCompile Include="test\CppNet.cpp">
55+
<Filter>test</Filter>
5656
</ClCompile>
5757
</ItemGroup>
5858
<ItemGroup>
59-
<ClInclude Include="Buffer.h">
59+
<ClInclude Include="base\Buffer.h">
6060
<Filter>base</Filter>
6161
</ClInclude>
62-
<ClInclude Include="Log.h">
62+
<ClInclude Include="base\Log.h">
6363
<Filter>base</Filter>
6464
</ClInclude>
65-
<ClInclude Include="LoopBuffer.h">
65+
<ClInclude Include="base\LoopBuffer.h">
6666
<Filter>base</Filter>
6767
</ClInclude>
68-
<ClInclude Include="MemaryPool.h">
68+
<ClInclude Include="base\MemaryPool.h">
6969
<Filter>base</Filter>
7070
</ClInclude>
71-
<ClInclude Include="PoolSharedPtr.h">
71+
<ClInclude Include="base\PoolSharedPtr.h">
7272
<Filter>base</Filter>
7373
</ClInclude>
74-
<ClInclude Include="Runnable.h">
74+
<ClInclude Include="base\Runnable.h">
7575
<Filter>base</Filter>
7676
</ClInclude>
77-
<ClInclude Include="RunnableAloneTaskList.h">
77+
<ClInclude Include="base\RunnableAloneTaskList.h">
7878
<Filter>base</Filter>
7979
</ClInclude>
80-
<ClInclude Include="RunnableAloneTaskListWithPost.h">
80+
<ClInclude Include="base\RunnableAloneTaskListWithPost.h">
8181
<Filter>base</Filter>
8282
</ClInclude>
83-
<ClInclude Include="RunnableShareTaskList.h">
83+
<ClInclude Include="base\RunnableShareTaskList.h">
8484
<Filter>base</Filter>
8585
</ClInclude>
86-
<ClInclude Include="Single.h">
86+
<ClInclude Include="base\Single.h">
8787
<Filter>base</Filter>
8888
</ClInclude>
89-
<ClInclude Include="TaskQueue.h">
89+
<ClInclude Include="base\TaskQueue.h">
9090
<Filter>base</Filter>
9191
</ClInclude>
92-
<ClInclude Include="Time.h">
92+
<ClInclude Include="base\TimeTool.h">
9393
<Filter>base</Filter>
9494
</ClInclude>
95-
<ClInclude Include="IOCP.h">
96-
<Filter>net\netio</Filter>
95+
<ClInclude Include="net\win\IOCP.h">
96+
<Filter>net\win</Filter>
9797
</ClInclude>
98-
<ClInclude Include="OSInfo.h">
99-
<Filter>base</Filter>
98+
<ClInclude Include="net\win\WinExpendFunc.h">
99+
<Filter>net\win</Filter>
100100
</ClInclude>
101-
<ClInclude Include="Timer.h">
101+
<ClInclude Include="net\AcceptSocket.h">
102102
<Filter>net</Filter>
103103
</ClInclude>
104-
<ClInclude Include="EventActions.h">
104+
<ClInclude Include="net\EventActions.h">
105105
<Filter>net</Filter>
106106
</ClInclude>
107-
<ClInclude Include="EventHandler.h">
107+
<ClInclude Include="net\EventHandler.h">
108108
<Filter>net</Filter>
109109
</ClInclude>
110-
<ClInclude Include="Socket.h">
110+
<ClInclude Include="net\OSInfo.h">
111111
<Filter>net</Filter>
112112
</ClInclude>
113-
<ClInclude Include="AcceptSocket.h">
113+
<ClInclude Include="net\Socket.h">
114114
<Filter>net</Filter>
115115
</ClInclude>
116-
<ClInclude Include="SocketBase.h">
116+
<ClInclude Include="net\SocketBase.h">
117117
<Filter>net</Filter>
118118
</ClInclude>
119-
<ClInclude Include="WinExpendFunc.h">
120-
<Filter>net\OS</Filter>
119+
<ClInclude Include="net\Timer.h">
120+
<Filter>net</Filter>
121121
</ClInclude>
122122
</ItemGroup>
123123
</Project>

‎CppNet.vcxproj.user

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎CppNet_client.filters

-123
This file was deleted.

0 commit comments

Comments
 (0)