Adding Windows Phone 8.1 Silverlight support.

stgates · stgates · commit 08fc225b0162 · 2014-10-13T15:42:15.000-07:00
diff --git a/Release/include/cpprest/ws_client.h b/Release/include/cpprest/ws_client.h
@@ -28,7 +28,7 @@
 #ifndef _CASA_WS_CLIENT_H
 #define _CASA_WS_CLIENT_H
 
-#if defined(__cplusplus_winrt) || !defined(_M_ARM)
+#if (defined(__cplusplus_winrt) || !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 #include <memory>
 #include <limits>
@@ -37,7 +37,6 @@
 
 #include "cpprest/xxpublic.h"
 
-#if _NOT_PHONE8_
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
@@ -467,6 +466,5 @@ class websocket_client
 
 }}}}
 
-#endif  // _NOT_PHONE8_
 #endif
 #endif  /* _CASA_WS_CLIENT_H */
diff --git a/Release/include/cpprest/ws_msg.h b/Release/include/cpprest/ws_msg.h
@@ -27,15 +27,14 @@
 #ifndef _CASA_WS_MSG_H
 #define _CASA_WS_MSG_H
 
-#if defined(__cplusplus_winrt) || !defined(_M_ARM)
+#if (defined(__cplusplus_winrt) || !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 #include <memory>
 #include <limits>
 
 #include "cpprest/xxpublic.h"
 #include "cpprest/producerconsumerstream.h"
 
-#if _NOT_PHONE8_
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
@@ -280,6 +279,5 @@ class websocket_incoming_message
 
 }}}}
 
-#endif  // _NOT_PHONE8_
 #endif
 #endif  /* _CASA_WS_MSG_H */
diff --git a/Release/include/cpprest/xxpublic.h b/Release/include/cpprest/xxpublic.h
@@ -44,30 +44,15 @@
 #endif
 #endif
 
-// forward declarations of windows types
-
-// for UINT_PTR types used in winsock APIs
-#ifdef _MS_WINDOWS
-#include <BaseTsd.h>
-#endif
-
 // for guids, used in comm.h
-#ifdef MS_TARGET_APPLE
+#if defined(MS_TARGET_APPLE)
 #include "cpprest/details/apple_compat.h"
-#else
-#ifdef _MS_WINDOWS
-#include <Guiddef.h>
-#include "cpprest/details/windows_compat.h"
-#else
+#elif !defined(_MS_WINDOWS)
 #include "boost/uuid/uuid.hpp"
 #endif
-#endif
 
 #define UNREACHABLE __assume(0)
 
 #ifdef __clang__
 #include <cstdio>
-#endif
-
-// Define the _NOT_PHONE8_ as non-windows or windows desktop without arm configuration or windows store app or windows phone8.1
-#define _NOT_PHONE8_ !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP && !defined(_M_ARM)) || WINAPI_FAMILY == WINAPI_FAMILY_APP || (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
+#endif
diff --git a/Release/src/build/vs11.wp8/casablanca110.wp8.vcxproj b/Release/src/build/vs11.wp8/casablanca110.wp8.vcxproj
@@ -34,7 +34,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPREST_EXCLUDE_WEBSOCKETS;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <CompileAsWinRT>true</CompileAsWinRT>
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/Release/src/build/vs12.wps81/casablanca120.wps81.vcxproj b/Release/src/build/vs12.wps81/casablanca120.wps81.vcxproj
@@ -0,0 +1,54 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E5F8A2F0-F713-4673-A42F-2CC4E8FB171B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <SccProjectName>SAK</SccProjectName>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccProvider>SAK</SccProvider>
+    <WindowsAppContainer>true</WindowsAppContainer>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <WinRTProject>true</WinRTProject>
+    <TargetXP>false</TargetXP>
+    <!-- This is only necessary for dev12 toolset, due to an msbuild change introduced in dev12 -->
+    <OutDir>$(OutDir)\$(MsBuildProjectName)</OutDir>
+    <ApplicationType>Windows Phone Silverlight</ApplicationType>
+    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugFileSuffix>d</DebugFileSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_wp81_$(CppRestSDKVersionFileSuffix)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>CPPREST_EXCLUDE_WEBSOCKETS;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalUsingDirectories>$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <AdditionalOptions>-Zm250 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>msxml6.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="../sources.proj" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/Release/src/build/vs12.wps81/packages.config b/Release/src/build/vs12.wps81/packages.config
@@ -0,0 +1,3 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+</packages>
diff --git a/Release/src/build/vs12/casablanca120.vcxproj b/Release/src/build/vs12/casablanca120.vcxproj
@@ -38,7 +38,7 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
diff --git a/Release/src/dirs.proj b/Release/src/dirs.proj
@@ -26,6 +26,7 @@
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120' and '$(Platform)'!='x64'">
       <ProjectFile Include="build\vs12.wp81\casablanca120.wp81.vcxproj" />
+      <ProjectFile Include="build\vs12.wps81\casablanca120.wps81.vcxproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
diff --git a/Release/src/utilities/asyncrt_utils.cpp b/Release/src/utilities/asyncrt_utils.cpp
@@ -25,6 +25,8 @@
 
 #include "stdafx.h"
 
+#include <mutex>
+
 #if defined(__cplusplus_winrt)
 using namespace Platform;
 using namespace Windows::Storage::Streams;
diff --git a/Release/src/websockets/client/ws_client.cpp b/Release/src/websockets/client/ws_client.cpp
@@ -34,7 +34,7 @@
 #include <memory>
 #include <thread>
 
-#if (!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) && !defined(_M_ARM) && (!defined(_MSC_VER) || (_MSC_VER < 1900))
+#if ((!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) && !defined(_M_ARM) && (!defined(_MSC_VER) || (_MSC_VER < 1900))) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 #if defined(__GNUC__)
 #include "pplx/threadpool.h"
 #pragma GCC diagnostic push
diff --git a/Release/src/websockets/client/ws_msg.cpp b/Release/src/websockets/client/ws_msg.cpp
@@ -31,8 +31,7 @@
 #include "cpprest/ws_msg.h"
 #include "cpprest/ws_client.h"
 
-#if !defined(_M_ARM) || defined(__cplusplus_winrt)
-#if _NOT_PHONE8_
+#if (defined(__cplusplus_winrt) || !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 using namespace concurrency;
 using namespace concurrency::streams::details;
@@ -82,5 +81,5 @@ pplx::task<std::string> websocket_incoming_message::extract_string() const
 }
 
 }}}}
-#endif  //  _NOT_PHONE8_
+
 #endif
diff --git a/Release/src/websockets/client/ws_winrt.cpp b/Release/src/websockets/client/ws_winrt.cpp
@@ -25,10 +25,9 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
-#include <concrt.h>
 
 // ws_winrt only available for Windows Store apps and Windows Phone 8.1
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
+#if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 using namespace ::Windows::Foundation;
 using namespace ::Windows::Storage;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+<packages>`
	`3`	`+</packages>`