Skip to content

Commit

Permalink
Updating json-cpp lib and replacing mongoose web server with civetweb.
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@jimevans
jimevans committed Aug 20, 2014
1 parent c376f4b commit a600ce9
Show file tree
Hide file tree
Showing 43 changed files with 16,207 additions and 6,700 deletions.
36 changes: 18 additions & 18 deletions WebDriver.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "cpp\iedriver\IE
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "third_party\json-cpp\json-cpp.vcxproj", "{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongoose", "third_party\mongoose\mongoose.vcxproj", "{9AEBD612-232D-40CB-BE2C-F2B911FD6228}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.Core", "dotnet\src\core\Selenium.Core.csproj", "{69F4FF0E-13DE-4AF6-B8AF-572A36239083}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSelenium", "dotnet\src\webdriverbackedselenium\Selenium.WebDriverBackedSelenium.csproj", "{0EAF6AA9-B712-464B-A11B-FA3CF7577D80}"
Expand Down Expand Up @@ -74,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-esr-previ
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-latest", "cpp\webdriver-firefox\webdriver-firefox-latest.vcxproj", "{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "third_party\civetweb\civetweb.vcxproj", "{231A8BED-6F2D-4688-A3BD-920310621BBF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
Expand Down Expand Up @@ -146,22 +146,6 @@ Global
{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}.Release|Win32.Build.0 = Release|Win32
{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}.Release|x64.ActiveCfg = Release|x64
{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}.Release|x64.Build.0 = Release|x64
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|.NET.ActiveCfg = Debug|x64
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Any CPU.ActiveCfg = Debug|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Win32.ActiveCfg = Debug|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|Win32.Build.0 = Debug|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|x64.ActiveCfg = Debug|x64
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Debug|x64.Build.0 = Debug|x64
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|.NET.ActiveCfg = Release|x64
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Any CPU.ActiveCfg = Release|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Mixed Platforms.Build.0 = Release|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Win32.ActiveCfg = Release|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|Win32.Build.0 = Release|Win32
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|x64.ActiveCfg = Release|x64
{9AEBD612-232D-40CB-BE2C-F2B911FD6228}.Release|x64.Build.0 = Release|x64
{69F4FF0E-13DE-4AF6-B8AF-572A36239083}.Debug|.NET.ActiveCfg = Debug|Any CPU
{69F4FF0E-13DE-4AF6-B8AF-572A36239083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69F4FF0E-13DE-4AF6-B8AF-572A36239083}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -456,6 +440,22 @@ Global
{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}.Release|Win32.ActiveCfg = Release|Win32
{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}.Release|Win32.Build.0 = Release|Win32
{FE99DB39-DAB7-43BD-BF08-6549FAB88C13}.Release|x64.ActiveCfg = Release|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|.NET.ActiveCfg = Debug|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Any CPU.ActiveCfg = Debug|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Mixed Platforms.Build.0 = Debug|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Win32.ActiveCfg = Debug|Win32
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|Win32.Build.0 = Debug|Win32
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|x64.ActiveCfg = Debug|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Debug|x64.Build.0 = Debug|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|.NET.ActiveCfg = Release|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Any CPU.ActiveCfg = Release|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Mixed Platforms.ActiveCfg = Release|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Mixed Platforms.Build.0 = Release|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Win32.ActiveCfg = Release|Win32
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|Win32.Build.0 = Release|Win32
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|x64.ActiveCfg = Release|x64
{231A8BED-6F2D-4688-A3BD-920310621BBF}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 0 additions & 1 deletion cpp/iedriver/IECommandHandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <map>
#include <memory>
#include <string>
#include "json.h"
#include "command_handler.h"
#include "command.h"
#include "Element.h"
Expand Down
12 changes: 6 additions & 6 deletions cpp/iedriver/IEDriver.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
Expand Down Expand Up @@ -124,7 +124,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
Expand Down Expand Up @@ -152,7 +152,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Expand All @@ -179,7 +179,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Expand All @@ -200,8 +200,8 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\third_party\mongoose\mongoose.vcxproj">
<Project>{9aebd612-232d-40cb-be2c-f2b911fd6228}</Project>
<ProjectReference Include="..\..\third_party\civetweb\civetweb.vcxproj">
<Project>{231a8bed-6f2d-4688-a3bd-920310621bbf}</Project>
</ProjectReference>
<ProjectReference Include="..\webdriver-interactions\webdriver-interactions.vcxproj">
<Project>{87fa39a1-958e-478a-8ab9-6d5e5aaa3886}</Project>
Expand Down
1 change: 0 additions & 1 deletion cpp/iedriver/Script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "AsyncScriptExecutor.h"
#include "IECommandExecutor.h"
#include "logging.h"
#include "json.h"
#include "VariantUtilities.h"

namespace webdriver {
Expand Down
1 change: 1 addition & 0 deletions cpp/iedriverserver/IEDriverServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "CommandLineArguments.h"
#include <algorithm>
#include <map>
#include <iostream>
#include <string>
#include <vector>

Expand Down
8 changes: 4 additions & 4 deletions cpp/iedriverserver/IEDriverServer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ExceptionHandling>Async</ExceptionHandling>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
Expand All @@ -112,7 +112,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ExceptionHandling>Async</ExceptionHandling>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
Expand All @@ -134,7 +134,7 @@
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<ExceptionHandling>Async</ExceptionHandling>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
Expand All @@ -155,7 +155,7 @@
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<ExceptionHandling>Async</ExceptionHandling>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
Expand Down
2 changes: 1 addition & 1 deletion cpp/webdriver-server/command.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void Command::Deserialize(const std::string& json) {
if (!successful_parse) {
// report to the user the failure and their locations in the document.
LOG(WARN) << "Failed to parse configuration due "
<< reader.getFormatedErrorMessages() << std::endl
<< reader.getFormattedErrorMessages() << std::endl
<< "JSON command: '" << json << "'";
}

Expand Down
31 changes: 9 additions & 22 deletions cpp/webdriver-server/server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,12 @@ void Server::Initialize(const int port,
this->PopulateCommandRepository();
}

void* Server::OnHttpEvent(enum mg_event event_raised,
struct mg_connection* conn,
const struct mg_request_info* request_info) {
LOG(TRACE) << "Entering Server::OnHttpEvent";

// Mongoose calls method with the following events:
// - MG_EVENT_LOG - on crying to log
// - MG_NEW_REQUEST - on processing new HTTP request
// - MG_HTTP_ERROR - on sending HTTP error
// - MG_REQUEST_COMPLETE - on request processing is completed (in last version of code)
int handler_result_code = 0;
if (event_raised == MG_NEW_REQUEST) {
handler_result_code = reinterpret_cast<Server*>(request_info->user_data)->
ProcessRequest(conn, request_info);
} else if (event_raised == MG_EVENT_LOG) {
LOG(WARN) << "Mongoose log event: " << request_info->log_message;
} else if (event_raised == MG_HTTP_ERROR) {
// do nothing due it will be reported as MG_EVENT_LOG with more info
}

return reinterpret_cast<void*>(handler_result_code);
int Server::OnNewHttpRequest(struct mg_connection* conn) {
mg_context* context = mg_get_context(conn);
Server* current_server = reinterpret_cast<Server*>(mg_get_user_data(context));
mg_request_info* request_info = mg_get_request_info(conn);
int handler_result_code = current_server->ProcessRequest(conn, request_info);
return handler_result_code;
}

bool Server::Start() {
Expand Down Expand Up @@ -107,7 +92,9 @@ bool Server::Start() {
"access_control_list", acl.c_str(),
// "enable_keep_alive", "yes",
NULL };
context_ = mg_start(&OnHttpEvent, this, options);
mg_callbacks callbacks = {};
callbacks.begin_request = &OnNewHttpRequest;
context_ = mg_start(&callbacks, this, options);
if (context_ == NULL) {
LOG(WARN) << "Failed to start Mongoose";
return false;
Expand Down
7 changes: 3 additions & 4 deletions cpp/webdriver-server/server.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <vector>
#include <map>
#include <string>
#include "civetweb.h"
#include "command_types.h"
#include "mongoose.h"
#include "response.h"
#include "session.h"

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

static void* OnHttpEvent(enum mg_event event_raised,
struct mg_connection* conn,
const struct mg_request_info* request_info);
static int OnNewHttpRequest(struct mg_connection* conn);

bool Start(void);
void Stop(void);
int ProcessRequest(struct mg_connection* conn,
Expand Down
14 changes: 7 additions & 7 deletions cpp/webdriver-server/webdriver-server.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -95,7 +95,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -111,7 +111,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -129,7 +129,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\mongoose;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json-cpp\include\json;$(ProjectDir)..\..\third_party\civetweb;$(ProjectDir)..\webdriver-interactions</AdditionalIncludeDirectories>
<ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -156,12 +156,12 @@
<ClInclude Include="session.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\third_party\civetweb\civetweb.vcxproj">
<Project>{231a8bed-6f2d-4688-a3bd-920310621bbf}</Project>
</ProjectReference>
<ProjectReference Include="..\..\third_party\json-cpp\json-cpp.vcxproj">
<Project>{320f3bbe-8223-4e7f-abee-18d3bd57b1fd}</Project>
</ProjectReference>
<ProjectReference Include="..\..\third_party\mongoose\mongoose.vcxproj">
<Project>{9aebd612-232d-40cb-be2c-f2b911fd6228}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
Loading

0 comments on commit a600ce9

Please sign in to comment.