Skip to content

Commit a600ce9

Browse files
jimevansjimevans
committed
Updating json-cpp lib and replacing mongoose web server with civetweb.
The Mongoose project has changed its licensing to GPL. This change replaces Mongoose with Civetweb, a fork of the Mongoose project at the last commit under the previous license. Civetweb is licensed using the MIT license. Additionally, the JsonCpp project has moved and changed owners. It now has a much simpler method of source code incorporation into additional projects. See the README for information about how to generate the code included here.
1 parent c376f4b commit a600ce9

Some content is hidden

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

43 files changed

+16207
-6700
lines changed

‎WebDriver.sln‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "cpp\iedriver\IE
3030
EndProject
3131
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "third_party\json-cpp\json-cpp.vcxproj", "{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}"
3232
EndProject
33-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongoose", "third_party\mongoose\mongoose.vcxproj", "{9AEBD612-232D-40CB-BE2C-F2B911FD6228}"
34-
EndProject
3533
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.Core", "dotnet\src\core\Selenium.Core.csproj", "{69F4FF0E-13DE-4AF6-B8AF-572A36239083}"
3634
EndProject
3735
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSelenium", "dotnet\src\webdriverbackedselenium\Selenium.WebDriverBackedSelenium.csproj", "{0EAF6AA9-B712-464B-A11B-FA3CF7577D80}"
@@ -74,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-esr-previ
7472
EndProject
7573
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-latest", "cpp\webdriver-firefox\webdriver-firefox-latest.vcxproj", "{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}"
7674
EndProject
75+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "third_party\civetweb\civetweb.vcxproj", "{231A8BED-6F2D-4688-A3BD-920310621BBF}"
76+
EndProject
7777
Global
7878
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7979
Debug|.NET = Debug|.NET
@@ -146,22 +146,6 @@ Global
146146
{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}.Release|Win32.Build.0 = Release|Win32
147147
{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}.Release|x64.ActiveCfg = Release|x64
148148
{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}.Release|x64.Build.0 = Release|x64
149-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|.NET.ActiveCfg = Debug|x64
150-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Any CPU.ActiveCfg = Debug|Win32
151-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
152-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Mixed Platforms.Build.0 = Debug|Win32
153-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Win32.ActiveCfg = Debug|Win32
154-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Win32.Build.0 = Debug|Win32
155-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|x64.ActiveCfg = Debug|x64
156-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|x64.Build.0 = Debug|x64
157-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|.NET.ActiveCfg = Release|x64
158-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Any CPU.ActiveCfg = Release|Win32
159-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Mixed Platforms.ActiveCfg = Release|Win32
160-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Mixed Platforms.Build.0 = Release|Win32
161-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Win32.ActiveCfg = Release|Win32
162-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Win32.Build.0 = Release|Win32
163-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|x64.ActiveCfg = Release|x64
164-
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|x64.Build.0 = Release|x64
165149
{69F4FF0E-13DE-4AF6-B8AF-572A36239083}.Debug|.NET.ActiveCfg = Debug|Any CPU
166150
{69F4FF0E-13DE-4AF6-B8AF-572A36239083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
167151
{69F4FF0E-13DE-4AF6-B8AF-572A36239083}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -456,6 +440,22 @@ Global
456440
{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}.Release|Win32.ActiveCfg = Release|Win32
457441
{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}.Release|Win32.Build.0 = Release|Win32
458442
{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}.Release|x64.ActiveCfg = Release|x64
443+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|.NET.ActiveCfg = Debug|x64
444+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Any CPU.ActiveCfg = Debug|x64
445+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
446+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Mixed Platforms.Build.0 = Debug|x64
447+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Win32.ActiveCfg = Debug|Win32
448+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Win32.Build.0 = Debug|Win32
449+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|x64.ActiveCfg = Debug|x64
450+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|x64.Build.0 = Debug|x64
451+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|.NET.ActiveCfg = Release|x64
452+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Any CPU.ActiveCfg = Release|x64
453+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Mixed Platforms.ActiveCfg = Release|x64
454+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Mixed Platforms.Build.0 = Release|x64
455+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Win32.ActiveCfg = Release|Win32
456+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Win32.Build.0 = Release|Win32
457+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|x64.ActiveCfg = Release|x64
458+
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|x64.Build.0 = Release|x64
459459
EndGlobalSection
460460
GlobalSection(SolutionProperties) = preSolution
461461
HideSolutionNode = FALSE

‎cpp/iedriver/IECommandHandler.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <map>
1818
#include <memory>
1919
#include <string>
20-
#include "json.h"
2120
#include "command_handler.h"
2221
#include "command.h"
2322
#include "Element.h"

‎cpp/iedriver/IEDriver.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9393
<ClCompile>
9494
<Optimization>Disabled</Optimization>
95-
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
95+
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9696
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<MinimalRebuild>false</MinimalRebuild>
9898
<ExceptionHandling>Async</ExceptionHandling>
@@ -124,7 +124,7 @@
124124
</Midl>
125125
<ClCompile>
126126
<Optimization>Disabled</Optimization>
127-
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128128
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
129129
<MinimalRebuild>false</MinimalRebuild>
130130
<ExceptionHandling>Async</ExceptionHandling>
@@ -152,7 +152,7 @@
152152
<ClCompile>
153153
<Optimization>MaxSpeed</Optimization>
154154
<IntrinsicFunctions>false</IntrinsicFunctions>
155-
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155+
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
156156
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157157
<ExceptionHandling>Async</ExceptionHandling>
158158
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -179,7 +179,7 @@
179179
<ClCompile>
180180
<Optimization>MaxSpeed</Optimization>
181181
<IntrinsicFunctions>false</IntrinsicFunctions>
182-
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182+
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
183183
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184184
<ExceptionHandling>Async</ExceptionHandling>
185185
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -200,8 +200,8 @@
200200
</Link>
201201
</ItemDefinitionGroup>
202202
<ItemGroup>
203-
<ProjectReference Include="..\..\third_party\mongoose\mongoose.vcxproj">
204-
<Project>{9aebd612-232d-40cb-be2c-f2b911fd6228}</Project>
203+
<ProjectReference Include="..\..\third_party\civetweb\civetweb.vcxproj">
204+
<Project>{231a8bed-6f2d-4688-a3bd-920310621bbf}</Project>
205205
</ProjectReference>
206206
<ProjectReference Include="..\webdriver-interactions\webdriver-interactions.vcxproj">
207207
<Project>{87fa39a1-958e-478a-8ab9-6d5e5aaa3886}</Project>

‎cpp/iedriver/Script.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "AsyncScriptExecutor.h"
1616
#include "IECommandExecutor.h"
1717
#include "logging.h"
18-
#include "json.h"
1918
#include "VariantUtilities.h"
2019

2120
namespace webdriver {

‎cpp/iedriverserver/IEDriverServer.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "CommandLineArguments.h"
1818
#include <algorithm>
1919
#include <map>
20+
#include <iostream>
2021
#include <string>
2122
#include <vector>
2223

‎cpp/iedriverserver/IEDriverServer.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<WarningLevel>Level3</WarningLevel>
9393
<Optimization>Disabled</Optimization>
9494
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95-
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
95+
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9696
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9797
<ExceptionHandling>Async</ExceptionHandling>
9898
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
@@ -112,7 +112,7 @@
112112
<WarningLevel>Level3</WarningLevel>
113113
<Optimization>Disabled</Optimization>
114114
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115-
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116116
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
117117
<ExceptionHandling>Async</ExceptionHandling>
118118
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
@@ -134,7 +134,7 @@
134134
<FunctionLevelLinking>false</FunctionLevelLinking>
135135
<IntrinsicFunctions>true</IntrinsicFunctions>
136136
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137-
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137+
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
139139
<ExceptionHandling>Async</ExceptionHandling>
140140
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
@@ -155,7 +155,7 @@
155155
<FunctionLevelLinking>false</FunctionLevelLinking>
156156
<IntrinsicFunctions>true</IntrinsicFunctions>
157157
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158-
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159159
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
160160
<ExceptionHandling>Async</ExceptionHandling>
161161
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>

‎cpp/webdriver-server/command.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void Command::Deserialize(const std::string& json) {
3838
if (!successful_parse) {
3939
// report to the user the failure and their locations in the document.
4040
LOG(WARN) << "Failed to parse configuration due "
41-
<< reader.getFormatedErrorMessages() << std::endl
41+
<< reader.getFormattedErrorMessages() << std::endl
4242
<< "JSON command: '" << json << "'";
4343
}
4444

‎cpp/webdriver-server/server.cc‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,12 @@ void Server::Initialize(const int port,
5656
this->PopulateCommandRepository();
5757
}
5858

59-
void* Server::OnHttpEvent(enum mg_event event_raised,
60-
struct mg_connection* conn,
61-
const struct mg_request_info* request_info) {
62-
LOG(TRACE) << "Entering Server::OnHttpEvent";
63-
64-
// Mongoose calls method with the following events:
65-
// - MG_EVENT_LOG - on crying to log
66-
// - MG_NEW_REQUEST - on processing new HTTP request
67-
// - MG_HTTP_ERROR - on sending HTTP error
68-
// - MG_REQUEST_COMPLETE - on request processing is completed (in last version of code)
69-
int handler_result_code = 0;
70-
if (event_raised == MG_NEW_REQUEST) {
71-
handler_result_code = reinterpret_cast<Server*>(request_info->user_data)->
72-
ProcessRequest(conn, request_info);
73-
} else if (event_raised == MG_EVENT_LOG) {
74-
LOG(WARN) << "Mongoose log event: " << request_info->log_message;
75-
} else if (event_raised == MG_HTTP_ERROR) {
76-
// do nothing due it will be reported as MG_EVENT_LOG with more info
77-
}
78-
79-
return reinterpret_cast<void*>(handler_result_code);
59+
int Server::OnNewHttpRequest(struct mg_connection* conn) {
60+
mg_context* context = mg_get_context(conn);
61+
Server* current_server = reinterpret_cast<Server*>(mg_get_user_data(context));
62+
mg_request_info* request_info = mg_get_request_info(conn);
63+
int handler_result_code = current_server->ProcessRequest(conn, request_info);
64+
return handler_result_code;
8065
}
8166

8267
bool Server::Start() {
@@ -107,7 +92,9 @@ bool Server::Start() {
10792
"access_control_list", acl.c_str(),
10893
// "enable_keep_alive", "yes",
10994
NULL };
110-
context_ = mg_start(&OnHttpEvent, this, options);
95+
mg_callbacks callbacks = {};
96+
callbacks.begin_request = &OnNewHttpRequest;
97+
context_ = mg_start(&callbacks, this, options);
11198
if (context_ == NULL) {
11299
LOG(WARN) << "Failed to start Mongoose";
113100
return false;

‎cpp/webdriver-server/server.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <vector>
2121
#include <map>
2222
#include <string>
23+
#include "civetweb.h"
2324
#include "command_types.h"
24-
#include "mongoose.h"
2525
#include "response.h"
2626
#include "session.h"
2727

@@ -34,9 +34,8 @@ class Server {
3434
Server(const int port, const std::string& host, const std::string& log_level, const std::string& log_file);
3535
virtual ~Server(void);
3636

37-
static void* OnHttpEvent(enum mg_event event_raised,
38-
struct mg_connection* conn,
39-
const struct mg_request_info* request_info);
37+
static int OnNewHttpRequest(struct mg_connection* conn);
38+
4039
bool Start(void);
4140
void Stop(void);
4241
int ProcessRequest(struct mg_connection* conn,

‎cpp/webdriver-server/webdriver-server.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<ClCompile>
8282
<WarningLevel>Level3</WarningLevel>
8383
<Optimization>Disabled</Optimization>
84-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
84+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
8585
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
8686
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8787
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -95,7 +95,7 @@
9595
<ClCompile>
9696
<WarningLevel>Level3</WarningLevel>
9797
<Optimization>Disabled</Optimization>
98-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
98+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
9999
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
100100
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
101101
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -111,7 +111,7 @@
111111
<Optimization>MaxSpeed</Optimization>
112112
<FunctionLevelLinking>true</FunctionLevelLinking>
113113
<IntrinsicFunctions>true</IntrinsicFunctions>
114-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
115115
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
116116
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
117117
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,7 +129,7 @@
129129
<Optimization>MaxSpeed</Optimization>
130130
<FunctionLevelLinking>true</FunctionLevelLinking>
131131
<IntrinsicFunctions>true</IntrinsicFunctions>
132-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
132+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
133133
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
134134
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
135135
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -156,12 +156,12 @@
156156
<ClInclude Include="session.h" />
157157
</ItemGroup>
158158
<ItemGroup>
159+
<ProjectReference Include="..\..\third_party\civetweb\civetweb.vcxproj">
160+
<Project>{231a8bed-6f2d-4688-a3bd-920310621bbf}</Project>
161+
</ProjectReference>
159162
<ProjectReference Include="..\..\third_party\json-cpp\json-cpp.vcxproj">
160163
<Project>{320f3bbe-8223-4e7f-abee-18d3bd57b1fd}</Project>
161164
</ProjectReference>
162-
<ProjectReference Include="..\..\third_party\mongoose\mongoose.vcxproj">
163-
<Project>{9aebd612-232d-40cb-be2c-f2b911fd6228}</Project>
164-
</ProjectReference>
165165
</ItemGroup>
166166
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
167167
<ImportGroup Label="ExtensionTargets">

0 commit comments

Comments
 (0)