Skip to content

Commit ff8c3f6

Browse files
ras0219-msftras0219-msft
committed
Initial commit of websockets for desktop
Addressed issues brought up during code review Fixed sources.proj to properly include ws_client.cpp
1 parent 6b2aba7 commit ff8c3f6

Some content is hidden

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

44 files changed

+2263
-127
lines changed

‎Build/Common.Build.settings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
<CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
4040
<CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>
4141
<CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
42+
<WebsocketppIncludeDir>$(BuildRoot)\Release\libs\websocketpp</WebsocketppIncludeDir>
43+
<PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\packages')">$(BuildRoot)\packages</PackagesRoot>
44+
<PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\packages')">$(BuildRoot)\..\Tools\packages</PackagesRoot>
4245
<CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
4346
<PocoRoot Condition="'$(PocoRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)')">$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)</PocoRoot>
4447
</PropertyGroup>

‎Release/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if(IOS)
2424

2525
set(BUILD_SHARED_LIBS OFF)
2626
elseif(UNIX) # This includes OSX
27-
find_package(Boost COMPONENTS system thread locale regex filesystem REQUIRED)
27+
find_package(Boost REQUIRED COMPONENTS random system thread locale regex filesystem)
2828
find_package(Threads REQUIRED)
2929
find_package(OpenSSL REQUIRED)
3030

@@ -80,7 +80,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
8080

8181
# These settings can be used by the test targets
8282
set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
83-
set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR})
83+
set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
84+
8485
set(Casablanca_LIBRARY ${LIB}cpprest)
8586
set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
8687

‎Release/include/cpprest/ws_client.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
****/
2525

2626
#pragma once
27-
#if WINAPI_FAMILY == WINAPI_FAMILY_APP
2827

2928
#ifndef _CASA_WS_CLIENT_H
3029
#define _CASA_WS_CLIENT_H
3130

31+
#if defined(__cplusplus_winrt) || !defined(_M_ARM)
32+
3233
#include <memory>
3334
#include <limits>
3435
#include <condition_variable>
@@ -205,6 +206,7 @@ class websocket_exception : public std::exception
205206
namespace details
206207
{
207208
class winrt_client;
209+
class ws_desktop_client;
208210

209211
// Interface to be implemented by the websocket client implementations.
210212
class _websocket_client_impl
@@ -381,6 +383,5 @@ class websocket_client
381383

382384
}}}}
383385

386+
#endif
384387
#endif /* _CASA_WS_CLIENT_H */
385-
386-
#endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */

‎Release/include/cpprest/ws_msg.h‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@
2323
* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
2424
****/
2525
#pragma once
26-
#if WINAPI_FAMILY == WINAPI_FAMILY_APP
2726

2827
#ifndef _CASA_WS_MSG_H
2928
#define _CASA_WS_MSG_H
3029

30+
#if defined(__cplusplus_winrt) || !defined(_M_ARM)
31+
3132
#include <memory>
3233
#include <limits>
3334

3435
#include "cpprest/xxpublic.h"
36+
#include "cpprest/containerstream.h"
3537

3638
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
3739
#include <ppltasks.h>
@@ -56,6 +58,7 @@ namespace client
5658
namespace details
5759
{
5860
class winrt_client;
61+
class ws_desktop_client;
5962
}
6063

6164

@@ -97,7 +100,7 @@ class _websocket_message
97100

98101
void set_length(size_t len) { m_length = len; }
99102

100-
size_t length() { return m_length; }
103+
size_t length() { return m_length; }
101104

102105
websocket_message_type message_type() { return m_msg_type; }
103106

@@ -190,6 +193,7 @@ class websocket_outgoing_message
190193
private:
191194

192195
friend class details::winrt_client;
196+
friend class details::ws_desktop_client;
193197

194198
std::shared_ptr<details::_websocket_message> _m_impl;
195199

@@ -257,11 +261,12 @@ class websocket_incoming_message
257261

258262
private:
259263
friend class details::winrt_client;
264+
friend class details::ws_desktop_client;
260265
std::shared_ptr<details::_websocket_message> _m_impl;
261266
};
262267

263268
}}}}
264269

265-
#endif /* _CASA_WS_MSG_H */
270+
#endif
266271

267-
#endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */
272+
#endif /* _CASA_WS_MSG_H */

‎Release/src/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ if(UNIX)
2121
http/listener/http_listener.cpp
2222
http/listener/http_msg_listen.cpp
2323
http/listener/http_server_api.cpp
24+
websockets/client/ws_msg.cpp
25+
websockets/client/ws_client.cpp
2426
utilities/base64.cpp
2527
)
2628
if(APPLE)
@@ -45,6 +47,8 @@ elseif(WIN32)
4547
http/listener/http_listener.cpp
4648
http/listener/http_msg_listen.cpp
4749
http/listener/http_server_api.cpp
50+
websockets/client/ws_msg.cpp
51+
websockets/client/ws_client.cpp
4852
utilities/base64.cpp
4953
http/client/http_win7.cpp
5054
http/listener/http_windows_server.cpp
@@ -73,6 +77,7 @@ target_link_libraries(${Casablanca_LIBRARY}
7377
${Boost_THREAD_LIBRARY}
7478
${Boost_LOCALE_LIBRARY}
7579
${Boost_REGEX_LIBRARY}
80+
${Boost_RANDOM_LIBRARY}
7681
${COREFOUNDATION}
7782
${EXTRALINKS}
7883
)

‎Release/src/build/casablanca110.vcxproj‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
43
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
54
<PropertyGroup Label="Globals">
65
<ProjectGuid>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</ProjectGuid>
@@ -13,28 +12,35 @@
1312
<ConfigurationType>DynamicLibrary</ConfigurationType>
1413
<PlatformToolset>v110</PlatformToolset>
1514
<WinRTProject>false</WinRTProject>
16-
<TargetXP>false</TargetXP>
15+
<TargetXP>false</TargetXP>
1716
</PropertyGroup>
18-
1917
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
2018
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2119
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2220
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
2321
<ImportGroup Label="PropertySheets">
2422
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
23+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc110.1.55.0.16\build\native\boost_system-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc110.1.55.0.16\build\native\boost_system-vc110.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc110.1.55.0.16\build\native\boost_date_time-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc110.1.55.0.16\build\native\boost_date_time-vc110.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets')" />
27+
<Import Project="$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets')" />
28+
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
29+
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
2530
</ImportGroup>
26-
2731
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2832
<DebugFileSuffix>d</DebugFileSuffix>
2933
</PropertyGroup>
3034
<PropertyGroup>
3135
<TargetName>$(CppRestBaseFileName)110$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</TargetName>
3236
</PropertyGroup>
33-
37+
<ItemGroup>
38+
<None Include="packages.config" />
39+
</ItemGroup>
3440
<ItemDefinitionGroup>
3541
<ClCompile>
3642
<PreprocessorDefinitions>_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
37-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
43+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3844
<PrecompiledHeader>Use</PrecompiledHeader>
3945
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
4046
<AdditionalOptions>-Zm160 %(AdditionalOptions)</AdditionalOptions>
@@ -43,9 +49,6 @@
4349
<AdditionalDependencies>Winhttp.lib;httpapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4450
</Link>
4551
</ItemDefinitionGroup>
46-
4752
<Import Project="sources.proj" />
48-
4953
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
50-
51-
</Project>
54+
</Project>

‎Release/src/build/casablanca110.winrt.vssscc‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Release/src/build/casablanca110.xp.vcxproj‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
44
<PropertyGroup Label="Globals">
@@ -20,17 +20,27 @@
2020
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
2121
<ImportGroup Label="PropertySheets">
2222
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
23+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc110.1.55.0.16\build\native\boost_system-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc110.1.55.0.16\build\native\boost_system-vc110.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_date_time-vc110.1.55.0.16\build\native\boost_date_time-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc110.1.55.0.16\build\native\boost_date_time-vc110.targets')" />
27+
<Import Project="$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets')" />
28+
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
29+
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
2330
</ImportGroup>
2431
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2532
<DebugFileSuffix>d</DebugFileSuffix>
2633
</PropertyGroup>
2734
<PropertyGroup>
2835
<TargetName>$(CppRestBaseFileName)110$(DebugFileSuffix)_xp_$(CppRestSDKVersionFileSuffix)</TargetName>
2936
</PropertyGroup>
37+
<ItemGroup>
38+
<None Include="packages.config" />
39+
</ItemGroup>
3040
<ItemDefinitionGroup>
3141
<ClCompile>
3242
<PreprocessorDefinitions>CPPREST_TARGET_XP;_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
33-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
43+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3444
<PrecompiledHeader>Use</PrecompiledHeader>
3545
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
3646
<AdditionalOptions>-Zm160 %(AdditionalOptions)</AdditionalOptions>
@@ -41,4 +51,4 @@
4151
</ItemDefinitionGroup>
4252
<Import Project="sources.proj" />
4353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
44-
</Project>
54+
</Project>

‎Release/src/build/casablanca120.vcxproj‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
43
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
54
<PropertyGroup Label="Globals">
65
<ProjectGuid>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</ProjectGuid>
@@ -13,28 +12,34 @@
1312
<ConfigurationType>DynamicLibrary</ConfigurationType>
1413
<PlatformToolset>v120</PlatformToolset>
1514
<WinRTProject>false</WinRTProject>
16-
<TargetXP>false</TargetXP>
15+
<TargetXP>false</TargetXP>
1716
</PropertyGroup>
18-
1917
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
2018
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2119
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2220
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
2321
<ImportGroup Label="PropertySheets">
2422
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
23+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets')" />
2527
</ImportGroup>
26-
2728
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2829
<DebugFileSuffix>d</DebugFileSuffix>
2930
</PropertyGroup>
3031
<PropertyGroup>
3132
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</TargetName>
3233
</PropertyGroup>
33-
34+
<ItemGroup>
35+
<None Include="packages.config">
36+
<SubType>Designer</SubType>
37+
</None>
38+
</ItemGroup>
3439
<ItemDefinitionGroup>
3540
<ClCompile>
3641
<PreprocessorDefinitions>_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
37-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
42+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3843
<PrecompiledHeader>Use</PrecompiledHeader>
3944
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
4045
<AdditionalOptions>-Zm160 %(AdditionalOptions)</AdditionalOptions>
@@ -43,9 +48,6 @@
4348
<AdditionalDependencies>Winhttp.lib;httpapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4449
</Link>
4550
</ItemDefinitionGroup>
46-
4751
<Import Project="sources.proj" />
48-
4952
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
50-
51-
</Project>
53+
</Project>

‎Release/src/build/casablanca120.xp.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
43
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
54
<PropertyGroup Label="Globals">
65
<ProjectGuid>{15F3B200-1AED-4B57-AF37-B21CD67914B1}</ProjectGuid>
@@ -15,26 +14,30 @@
1514
<WinRTProject>false</WinRTProject>
1615
<TargetXP>true</TargetXP>
1716
</PropertyGroup>
18-
1917
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
2018
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2119
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2220
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
2321
<ImportGroup Label="PropertySheets">
2422
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
23+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets')" />
2527
</ImportGroup>
26-
2728
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2829
<DebugFileSuffix>d</DebugFileSuffix>
2930
</PropertyGroup>
3031
<PropertyGroup>
3132
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_xp_$(CppRestSDKVersionFileSuffix)</TargetName>
3233
</PropertyGroup>
33-
34+
<ItemGroup>
35+
<None Include="packages.config" />
36+
</ItemGroup>
3437
<ItemDefinitionGroup>
3538
<ClCompile>
3639
<PreprocessorDefinitions>CPPREST_TARGET_XP;_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
37-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
40+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3841
<PrecompiledHeader>Use</PrecompiledHeader>
3942
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
4043
<AdditionalOptions>-Zm160 %(AdditionalOptions)</AdditionalOptions>
@@ -43,9 +46,6 @@
4346
<AdditionalDependencies>Winhttp.lib;httpapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4447
</Link>
4548
</ItemDefinitionGroup>
46-
4749
<Import Project="sources.proj" />
48-
4950
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
50-
5151
</Project>

0 commit comments

Comments
 (0)