Skip to content

Commit 4b8b0fe

Browse files
kavyakokavyako
committed
Merge branch 'feelapi-staticxp' into development
2 parents 47689b3 + c7c044f commit 4b8b0fe

File tree

3 files changed

+143
-10
lines changed

3 files changed

+143
-10
lines changed

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

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
4+
<ItemGroup Label="ProjectConfigurations">
5+
<ProjectConfiguration Include="DebugStatic|ARM">
6+
<Configuration>DebugStatic</Configuration>
7+
<Platform>ARM</Platform>
8+
</ProjectConfiguration>
9+
<ProjectConfiguration Include="DebugStatic|Win32">
10+
<Configuration>DebugStatic</Configuration>
11+
<Platform>Win32</Platform>
12+
</ProjectConfiguration>
13+
<ProjectConfiguration Include="DebugStatic|x64">
14+
<Configuration>DebugStatic</Configuration>
15+
<Platform>x64</Platform>
16+
</ProjectConfiguration>
17+
<ProjectConfiguration Include="ReleaseStatic|ARM">
18+
<Configuration>ReleaseStatic</Configuration>
19+
<Platform>ARM</Platform>
20+
</ProjectConfiguration>
21+
<ProjectConfiguration Include="ReleaseStatic|Win32">
22+
<Configuration>ReleaseStatic</Configuration>
23+
<Platform>Win32</Platform>
24+
</ProjectConfiguration>
25+
<ProjectConfiguration Include="ReleaseStatic|x64">
26+
<Configuration>ReleaseStatic</Configuration>
27+
<Platform>x64</Platform>
28+
</ProjectConfiguration>
29+
</ItemGroup>
30+
<PropertyGroup Label="Globals">
31+
<ProjectGuid>{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}</ProjectGuid>
32+
<Keyword>Win32Proj</Keyword>
33+
<SccProjectName>SAK</SccProjectName>
34+
<SccAuxPath>SAK</SccAuxPath>
35+
<SccLocalPath>SAK</SccLocalPath>
36+
<SccProvider>SAK</SccProvider>
37+
<ConfigurationType>StaticLibrary</ConfigurationType>
38+
<PlatformToolset>v120_xp</PlatformToolset>
39+
<WinRTProject>false</WinRTProject>
40+
<TargetXP>true</TargetXP>
41+
<ProjectName>cpprestsdk120.xp.static</ProjectName>
42+
</PropertyGroup>
43+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
44+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
45+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
47+
<!-- Necessary because OpenSSL and zlib NuGet packages aren't built for the v120_xp toolset. Force them to be on. -->
48+
<PropertyGroup>
49+
<Force-Enable-openssl-v120-windesktop-msvcstl-static-rt-dyn-x86 Condition="'$(Platform)' == 'Win32'">true</Force-Enable-openssl-v120-windesktop-msvcstl-static-rt-dyn-x86>
50+
<Force-Enable-openssl-v120-windesktop-msvcstl-static-rt-dyn-x64 Condition="'$(Platform)' == 'x64'">true</Force-Enable-openssl-v120-windesktop-msvcstl-static-rt-dyn-x64>
51+
<Force-Enable-zlib-v120-windesktop-msvcstl-static-rt-dyn-x86 Condition="'$(Platform)' == 'Win32'">true</Force-Enable-zlib-v120-windesktop-msvcstl-static-rt-dyn-x86>
52+
<Force-Enable-zlib-v120-windesktop-msvcstl-static-rt-dyn-x64 Condition="'$(Platform)' == 'x64'">true</Force-Enable-zlib-v120-windesktop-msvcstl-static-rt-dyn-x64>
53+
</PropertyGroup>
54+
<ImportGroup Label="PropertySheets">
55+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
57+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0.0\build\native\boost_system-vc120.targets')" />
58+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0.0\build\native\boost_date_time-vc120.targets')" />
59+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets')" />
60+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
61+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
62+
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets')" />
63+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
64+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
65+
</ImportGroup>
66+
<PropertyGroup Condition="'$(Configuration)'=='DebugStatic'">
67+
<DebugFileSuffix>d</DebugFileSuffix>
68+
</PropertyGroup>
69+
<PropertyGroup>
70+
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_xp_$(CppRestSDKVersionFileSuffix)</TargetName>
71+
<NuGetPackageImportStamp>58b07c0c</NuGetPackageImportStamp>
72+
</PropertyGroup>
73+
<ItemGroup>
74+
<None Include="packages.config" />
75+
</ItemGroup>
76+
<ItemDefinitionGroup>
77+
<ClCompile>
78+
<PreprocessorDefinitions>_NO_ASYNCRTIMP;_WINSOCK_DEPRECATED_NO_WARNINGS;CPPREST_TARGET_XP;_ASYNCRT_EXPORT;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
80+
<PrecompiledHeader>Use</PrecompiledHeader>
81+
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
82+
<AdditionalOptions>-Zm160 /bigobj %(AdditionalOptions)</AdditionalOptions>
83+
<RuntimeLibrary Condition="'$(Configuration)'=='DebugStatic'">MultiThreadedDebugDLL</RuntimeLibrary>
84+
<RuntimeLibrary Condition="'$(Configuration)'=='ReleaseStatic'">MultiThreadedDLL</RuntimeLibrary>
85+
<WholeProgramOptimization Condition="'$(Configuration)'=='ReleaseStatic'">true</WholeProgramOptimization>
86+
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
87+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
88+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
89+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugStatic|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
90+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
91+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
92+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
93+
</ClCompile>
94+
<Link>
95+
<AdditionalDependencies>Winhttp.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
96+
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='ReleaseStatic'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
97+
</Link>
98+
</ItemDefinitionGroup>
99+
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
100+
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
101+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
102+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
103+
<PropertyGroup>
104+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
105+
</PropertyGroup>
106+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets'))" />
107+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets'))" />
108+
</Target>
109+
</Project>

‎Release/src/build/vs12.xp.static/packages.config‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="boost" version="1.58.0" targetFramework="Native" developmentDependency="true" />
4+
<package id="boost_chrono-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
5+
<package id="boost_date_time-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
6+
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
7+
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
8+
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
12+
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
13+
</packages>

‎cpprestsdk120.sln‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Express 2013 for Windows Desktop
3+
# Visual Studio 2013
44
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "android", "Release\src\build\android.vcxitems", "{65951C40-A332-4B54-89C2-7CDAF30D5F66}"
@@ -65,23 +65,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FacebookDemo120", "Release\
6565
EndProject
6666
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpprestsdk120.wod", "Release\src\build\vs12.wod\casablanca120.wod.vcxproj", "{BA4F15A0-6F9C-4ED6-A132-D6F7D0E08D6A}"
6767
EndProject
68+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpprestsdk120.xp.static", "Release\src\build\vs12.xp.static\casablanca120.xp.static.vcxproj", "{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}"
69+
EndProject
6870
Global
6971
GlobalSection(SharedMSBuildProjectFiles) = preSolution
70-
Release\src\build\common.vcxitems*{c5d88d15-f9f5-48e2-9ef2-be0b645b9c0d}*SharedItemsImports = 4
71-
Release\src\build\winrt.vcxitems*{c5d88d15-f9f5-48e2-9ef2-be0b645b9c0d}*SharedItemsImports = 4
72+
Release\src\build\win32.vcxitems*{cf74448d-fe99-4e3c-afa6-a50f3145baf3}*SharedItemsImports = 4
73+
Release\src\build\common.vcxitems*{cf74448d-fe99-4e3c-afa6-a50f3145baf3}*SharedItemsImports = 4
7274
Release\src\build\winrt.vcxitems*{0a9ba181-7876-4b3d-a5e0-ee673fa51c05}*SharedItemsImports = 9
7375
Release\src\build\android.vcxitems*{65951c40-a332-4b54-89c2-7cdaf30d5f66}*SharedItemsImports = 9
74-
Release\src\build\common.vcxitems*{15f3b200-1aed-4b57-af37-b21cd67914b1}*SharedItemsImports = 4
7576
Release\src\build\win32.vcxitems*{15f3b200-1aed-4b57-af37-b21cd67914b1}*SharedItemsImports = 4
76-
Release\src\build\common.vcxitems*{9ad285a2-301e-47a0-a299-14ad5d4f2758}*SharedItemsImports = 4
77-
Release\src\build\winrt.vcxitems*{9ad285a2-301e-47a0-a299-14ad5d4f2758}*SharedItemsImports = 4
78-
Release\src\build\common.vcxitems*{01a76234-e6e8-4332-9fe2-1e12c34621be}*SharedItemsImports = 4
77+
Release\src\build\common.vcxitems*{15f3b200-1aed-4b57-af37-b21cd67914b1}*SharedItemsImports = 4
7978
Release\src\build\win32.vcxitems*{01a76234-e6e8-4332-9fe2-1e12c34621be}*SharedItemsImports = 4
80-
Release\src\build\common.vcxitems*{ba4f15a0-6f9c-4ed6-a132-d6f7d0e08d6a}*SharedItemsImports = 4
79+
Release\src\build\common.vcxitems*{01a76234-e6e8-4332-9fe2-1e12c34621be}*SharedItemsImports = 4
8180
Release\src\build\win32.vcxitems*{ba4f15a0-6f9c-4ed6-a132-d6f7d0e08d6a}*SharedItemsImports = 4
81+
Release\src\build\common.vcxitems*{ba4f15a0-6f9c-4ed6-a132-d6f7d0e08d6a}*SharedItemsImports = 4
8282
Release\src\build\win32.vcxitems*{f40f4804-50f9-4257-8d74-b9cbb19ac4c3}*SharedItemsImports = 9
83-
Release\src\build\common.vcxitems*{e5f8a2f0-f713-4673-a42f-2cc4e8fb171b}*SharedItemsImports = 4
84-
Release\src\build\winrt.vcxitems*{e5f8a2f0-f713-4673-a42f-2cc4e8fb171b}*SharedItemsImports = 4
8583
Release\src\build\other.vcxitems*{3d5908f7-7673-4229-bc46-2007a7af9cae}*SharedItemsImports = 9
8684
Release\src\build\common.vcxitems*{594dcb5f-07e3-4084-a2ce-268611fa629f}*SharedItemsImports = 9
8785
EndGlobalSection
@@ -272,6 +270,18 @@ Global
272270
{BA4F15A0-6F9C-4ED6-A132-D6F7D0E08D6A}.Release|Win32.Build.0 = Release|Win32
273271
{BA4F15A0-6F9C-4ED6-A132-D6F7D0E08D6A}.Release|x64.ActiveCfg = Release|x64
274272
{BA4F15A0-6F9C-4ED6-A132-D6F7D0E08D6A}.Release|x64.Build.0 = Release|x64
273+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Debug|ARM.ActiveCfg = DebugStatic|ARM
274+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Debug|ARM.Build.0 = DebugStatic|ARM
275+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Debug|Win32.ActiveCfg = DebugStatic|Win32
276+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Debug|Win32.Build.0 = DebugStatic|Win32
277+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Debug|x64.ActiveCfg = DebugStatic|x64
278+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Debug|x64.Build.0 = DebugStatic|x64
279+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Release|ARM.ActiveCfg = ReleaseStatic|ARM
280+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Release|ARM.Build.0 = ReleaseStatic|ARM
281+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Release|Win32.ActiveCfg = ReleaseStatic|Win32
282+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Release|Win32.Build.0 = ReleaseStatic|Win32
283+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Release|x64.ActiveCfg = ReleaseStatic|x64
284+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3}.Release|x64.Build.0 = ReleaseStatic|x64
275285
EndGlobalSection
276286
GlobalSection(SolutionProperties) = preSolution
277287
HideSolutionNode = FALSE
@@ -306,5 +316,6 @@ Global
306316
{3E5DF179-3668-49DA-9B6D-38C0632D8F28} = {B27A3D67-1423-48D8-9F6D-D8FD7E682EC7}
307317
{43DE4DF3-ACAA-429E-B260-CC6D4FE82658} = {3E5DF179-3668-49DA-9B6D-38C0632D8F28}
308318
{BA4F15A0-6F9C-4ED6-A132-D6F7D0E08D6A} = {E25A1A01-9AB0-41C5-A03B-F6B83F5E66B9}
319+
{CF74448D-FE99-4E3C-AFA6-A50F3145BAF3} = {E25A1A01-9AB0-41C5-A03B-F6B83F5E66B9}
309320
EndGlobalSection
310321
EndGlobal

0 commit comments

Comments
 (0)