Skip to content

Commit 60821da

Browse files
committed
Add missing Makefile for Blackjack and other fixes
1 parent 79194a2 commit 60821da

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

Release/include/cpprest/targetver.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
#ifdef WIN32
3535
#ifdef CPPREST_TARGET_XP
3636
#include <winsdkver.h>
37+
#ifndef _WIN32_WINNT
3738
#define _WIN32_WINNT _WIN32_WINNT_WS03 //Windows XP with SP2
3839
#endif
40+
#endif
3941
#include <SDKDDKVer.h>
4042
#endif

Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@
3232
<ConfigurationType>Application</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
3434
<CharacterSet>NotSet</CharacterSet>
35-
<PlatformToolset>v110</PlatformToolset>
35+
<PlatformToolset>v110_xp</PlatformToolset>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3838
<ConfigurationType>Application</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
4040
<CharacterSet>NotSet</CharacterSet>
41-
<PlatformToolset>v110</PlatformToolset>
41+
<PlatformToolset>v110_xp</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<UseDebugLibraries>false</UseDebugLibraries>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<CharacterSet>NotSet</CharacterSet>
48-
<PlatformToolset>v110</PlatformToolset>
48+
<PlatformToolset>v110_xp</PlatformToolset>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
5353
<WholeProgramOptimization>true</WholeProgramOptimization>
5454
<CharacterSet>NotSet</CharacterSet>
55-
<PlatformToolset>v110</PlatformToolset>
55+
<PlatformToolset>v110_xp</PlatformToolset>
5656
</PropertyGroup>
5757
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5858
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
File renamed without changes.

Release/src/build/casablanca110.xp.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<SccLocalPath>SAK</SccLocalPath>
1111
<SccProvider>SAK</SccProvider>
1212
<ConfigurationType>DynamicLibrary</ConfigurationType>
13-
<PlatformToolset>v110</PlatformToolset>
13+
<PlatformToolset>v110_xp</PlatformToolset>
1414
<WinRTProject>false</WinRTProject>
1515
<TargetXP>true</TargetXP>
1616
</PropertyGroup>
@@ -36,7 +36,7 @@
3636
<AdditionalOptions>-Zm160 %(AdditionalOptions)</AdditionalOptions>
3737
</ClCompile>
3838
<Link>
39-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
39+
<AdditionalDependencies>Kernel32.lib;Winhttp.lib;httpapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4040
</Link>
4141
</ItemDefinitionGroup>
4242
<Import Project="sources.proj" />

Release/src/build/sources.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177

178178

179179
<!-- PPLX files for pre-Dev12 toolsets go here -->
180-
<ItemGroup Condition="'$(PlatformToolset)' == 'v100' or '$(PlatformToolset)' == 'v110' or '$(PlatformToolset)' == 'v110_wp80'">
180+
<ItemGroup Condition="'$(PlatformToolset)' == 'v100' or '$(PlatformToolset)' == 'v110' or '$(PlatformToolset)' == 'v110_xp' or '$(PlatformToolset)' == 'v110_wp80'">
181181
<ClCompile Include="$(CasablancaSrcDir)\pplx\pplx.cpp">
182182
<Filter>Source Files</Filter>
183183
</ClCompile>

0 commit comments

Comments
 (0)