Skip to content

Commit c25275d

Browse files
awwitawwit
committed
Fixed build for Windows platform (after refactor)
1 parent 0e20e1b commit c25275d

File tree

7 files changed

+212
-106
lines changed

7 files changed

+212
-106
lines changed

‎projects/msvs/httpserver.vcxproj‎

Lines changed: 75 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
@@ -19,57 +19,82 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<ClCompile Include="..\..\src\ConfigParser.cpp" />
23-
<ClCompile Include="..\..\src\DataVariantFormUrlencoded.cpp" />
24-
<ClCompile Include="..\..\src\DataVariantMultipartFormData.cpp" />
25-
<ClCompile Include="..\..\src\DataVariantTextPlain.cpp" />
26-
<ClCompile Include="..\..\src\Event.cpp" />
27-
<ClCompile Include="..\..\src\FileIncoming.cpp" />
28-
<ClCompile Include="..\..\src\GlobalMutex.cpp" />
2922
<ClCompile Include="..\..\src\Main.cpp" />
30-
<ClCompile Include="..\..\src\Module.cpp" />
31-
<ClCompile Include="..\..\src\RequestParameters.cpp" />
32-
<ClCompile Include="..\..\src\Server.cpp" />
33-
<ClCompile Include="..\..\src\ServerApplicationsTree.cpp" />
34-
<ClCompile Include="..\..\src\SharedMemory.cpp" />
23+
<ClCompile Include="..\..\src\server\config\ConfigParser.cpp" />
24+
<ClCompile Include="..\..\src\server\data-variant\Abstract.cpp" />
25+
<ClCompile Include="..\..\src\server\data-variant\FormUrlencoded.cpp" />
26+
<ClCompile Include="..\..\src\server\data-variant\MultipartFormData.cpp" />
27+
<ClCompile Include="..\..\src\server\data-variant\TextPlain.cpp" />
28+
<ClCompile Include="..\..\src\server\protocol\extensions\Sendfile.cpp" />
29+
<ClCompile Include="..\..\src\server\protocol\ServerHttp1.cpp" />
30+
<ClCompile Include="..\..\src\server\protocol\ServerHttp2.cpp" />
31+
<ClCompile Include="..\..\src\server\protocol\ServerHttp2Protocol.cpp" />
32+
<ClCompile Include="..\..\src\server\protocol\ServerHttp2Stream.cpp" />
33+
<ClCompile Include="..\..\src\server\protocol\ServerProtocol.cpp" />
34+
<ClCompile Include="..\..\src\server\protocol\ServerWebSocket.cpp" />
35+
<ClCompile Include="..\..\src\server\Request.cpp" />
36+
<ClCompile Include="..\..\src\server\Server.cpp" />
37+
<ClCompile Include="..\..\src\server\ServerApplicationsTree.cpp" />
38+
<ClCompile Include="..\..\src\server\ServerControls.cpp" />
39+
<ClCompile Include="..\..\src\server\ServerSettings.cpp" />
3540
<ClCompile Include="..\..\src\SignalHandlers.cpp" />
36-
<ClCompile Include="..\..\src\Socket.cpp" />
37-
<ClCompile Include="..\..\src\SocketAdapter.cpp" />
38-
<ClCompile Include="..\..\src\SocketAdapterDefault.cpp" />
39-
<ClCompile Include="..\..\src\SocketAdapterTls.cpp" />
40-
<ClCompile Include="..\..\src\SocketList.cpp" />
41-
<ClCompile Include="..\..\src\System.cpp" />
42-
<ClCompile Include="..\..\src\Utils.cpp" />
41+
<ClCompile Include="..\..\src\socket\Adapter.cpp" />
42+
<ClCompile Include="..\..\src\socket\AdapterDefault.cpp" />
43+
<ClCompile Include="..\..\src\socket\AdapterTls.cpp" />
44+
<ClCompile Include="..\..\src\socket\List.cpp" />
45+
<ClCompile Include="..\..\src\socket\Socket.cpp" />
46+
<ClCompile Include="..\..\src\system\GlobalMutex.cpp" />
47+
<ClCompile Include="..\..\src\system\Module.cpp" />
48+
<ClCompile Include="..\..\src\system\SharedMemory.cpp" />
49+
<ClCompile Include="..\..\src\system\System.cpp" />
50+
<ClCompile Include="..\..\src\transfer\FileIncoming.cpp" />
51+
<ClCompile Include="..\..\src\transfer\http2\HPack.cpp" />
52+
<ClCompile Include="..\..\src\transfer\http2\Http2.cpp" />
53+
<ClCompile Include="..\..\src\utils\Event.cpp" />
54+
<ClCompile Include="..\..\src\utils\Utils.cpp" />
4355
</ItemGroup>
4456
<ItemGroup>
45-
<ClInclude Include="..\..\src\ConfigParser.h" />
46-
<ClInclude Include="..\..\src\DataVariantAbstract.h" />
47-
<ClInclude Include="..\..\src\DataVariantFormUrlencoded.h" />
48-
<ClInclude Include="..\..\src\DataVariantMultipartFormData.h" />
49-
<ClInclude Include="..\..\src\DataVariantTextPlain.h" />
50-
<ClInclude Include="..\..\src\Event.h" />
51-
<ClInclude Include="..\..\src\FileIncoming.h" />
52-
<ClInclude Include="..\..\src\GlobalMutex.h" />
5357
<ClInclude Include="..\..\src\Main.h" />
54-
<ClInclude Include="..\..\src\Module.h" />
55-
<ClInclude Include="..\..\src\RawData.h" />
56-
<ClInclude Include="..\..\src\RequestParameters.h" />
57-
<ClInclude Include="..\..\src\Server.h" />
58-
<ClInclude Include="..\..\src\ServerApplicationDefaultSettings.h" />
59-
<ClInclude Include="..\..\src\ServerApplicationSettings.h" />
60-
<ClInclude Include="..\..\src\ServerApplicationsTree.h" />
61-
<ClInclude Include="..\..\src\ServerRequest.h" />
62-
<ClInclude Include="..\..\src\ServerResponse.h" />
63-
<ClInclude Include="..\..\src\ServerStructuresArguments.h" />
64-
<ClInclude Include="..\..\src\SharedMemory.h" />
58+
<ClInclude Include="..\..\src\server\config\ConfigParser.h" />
59+
<ClInclude Include="..\..\src\server\data-variant\Abstract.h" />
60+
<ClInclude Include="..\..\src\server\data-variant\FormUrlencoded.h" />
61+
<ClInclude Include="..\..\src\server\data-variant\MultipartFormData.h" />
62+
<ClInclude Include="..\..\src\server\data-variant\TextPlain.h" />
63+
<ClInclude Include="..\..\src\server\protocol\extensions\Sendfile.h" />
64+
<ClInclude Include="..\..\src\server\protocol\ServerHttp1.h" />
65+
<ClInclude Include="..\..\src\server\protocol\ServerHttp2.h" />
66+
<ClInclude Include="..\..\src\server\protocol\ServerHttp2Protocol.h" />
67+
<ClInclude Include="..\..\src\server\protocol\ServerHttp2Stream.h" />
68+
<ClInclude Include="..\..\src\server\protocol\ServerProtocol.h" />
69+
<ClInclude Include="..\..\src\server\protocol\ServerWebSocket.h" />
70+
<ClInclude Include="..\..\src\server\Request.h" />
71+
<ClInclude Include="..\..\src\server\Server.h" />
72+
<ClInclude Include="..\..\src\server\ServerApplicationSettings.h" />
73+
<ClInclude Include="..\..\src\server\ServerApplicationsTree.h" />
74+
<ClInclude Include="..\..\src\server\ServerControls.h" />
75+
<ClInclude Include="..\..\src\server\ServerSettings.h" />
76+
<ClInclude Include="..\..\src\server\ServerStructuresArguments.h" />
77+
<ClInclude Include="..\..\src\server\SocketsQueue.h" />
6578
<ClInclude Include="..\..\src\SignalHandlers.h" />
66-
<ClInclude Include="..\..\src\Socket.h" />
67-
<ClInclude Include="..\..\src\SocketAdapter.h" />
68-
<ClInclude Include="..\..\src\SocketAdapterDefault.h" />
69-
<ClInclude Include="..\..\src\SocketAdapterTls.h" />
70-
<ClInclude Include="..\..\src\SocketList.h" />
71-
<ClInclude Include="..\..\src\System.h" />
72-
<ClInclude Include="..\..\src\Utils.h" />
79+
<ClInclude Include="..\..\src\socket\Adapter.h" />
80+
<ClInclude Include="..\..\src\socket\AdapterDefault.h" />
81+
<ClInclude Include="..\..\src\socket\AdapterTls.h" />
82+
<ClInclude Include="..\..\src\socket\List.h" />
83+
<ClInclude Include="..\..\src\socket\Socket.h" />
84+
<ClInclude Include="..\..\src\system\Cache.h" />
85+
<ClInclude Include="..\..\src\system\GlobalMutex.h" />
86+
<ClInclude Include="..\..\src\system\Module.h" />
87+
<ClInclude Include="..\..\src\system\SharedMemory.h" />
88+
<ClInclude Include="..\..\src\system\System.h" />
89+
<ClInclude Include="..\..\src\transfer\AppRequest.h" />
90+
<ClInclude Include="..\..\src\transfer\AppResponse.h" />
91+
<ClInclude Include="..\..\src\transfer\FileIncoming.h" />
92+
<ClInclude Include="..\..\src\transfer\http2\HPack.h" />
93+
<ClInclude Include="..\..\src\transfer\http2\Http2.h" />
94+
<ClInclude Include="..\..\src\transfer\HttpStatusCode.h" />
95+
<ClInclude Include="..\..\src\transfer\ProtocolVariant.h" />
96+
<ClInclude Include="..\..\src\utils\Event.h" />
97+
<ClInclude Include="..\..\src\utils\Utils.h" />
7398
</ItemGroup>
7499
<PropertyGroup Label="Globals">
75100
<ProjectGuid>{A7023B84-DA18-3E3E-A9AE-B87F45CAC37F}</ProjectGuid>
@@ -84,7 +109,7 @@
84109
<CharacterSet>MultiByte</CharacterSet>
85110
<ConfigurationType>Application</ConfigurationType>
86111
<IntermediateDirectory>release\</IntermediateDirectory>
87-
<PlatformToolset>v140</PlatformToolset>
112+
<PlatformToolset>v141</PlatformToolset>
88113
<WholeProgramOptimization>true</WholeProgramOptimization>
89114
</PropertyGroup>
90115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -93,7 +118,7 @@
93118
<CharacterSet>MultiByte</CharacterSet>
94119
<ConfigurationType>Application</ConfigurationType>
95120
<IntermediateDirectory>release\</IntermediateDirectory>
96-
<PlatformToolset>v140</PlatformToolset>
121+
<PlatformToolset>v141</PlatformToolset>
97122
<WholeProgramOptimization>true</WholeProgramOptimization>
98123
</PropertyGroup>
99124
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -102,15 +127,15 @@
102127
<CharacterSet>MultiByte</CharacterSet>
103128
<ConfigurationType>Application</ConfigurationType>
104129
<IntermediateDirectory>debug\</IntermediateDirectory>
105-
<PlatformToolset>v140</PlatformToolset>
130+
<PlatformToolset>v141</PlatformToolset>
106131
</PropertyGroup>
107132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
108133
<OutputDirectory>debug\</OutputDirectory>
109134
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
110135
<CharacterSet>MultiByte</CharacterSet>
111136
<ConfigurationType>Application</ConfigurationType>
112137
<IntermediateDirectory>debug\</IntermediateDirectory>
113-
<PlatformToolset>v140</PlatformToolset>
138+
<PlatformToolset>v141</PlatformToolset>
114139
</PropertyGroup>
115140
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
116141
<ImportGroup Label="ExtensionSettings" />

0 commit comments

Comments
 (0)