Skip to content

Commit e28f1e6

Browse files
ras0219-msftras0219-msft
committed
Moved casablanca*.vcxproj's into separate folders. Upgraded compiler tools for dev14 projects.
1 parent 240eb0e commit e28f1e6

File tree

74 files changed

+447
-415
lines changed

Some content is hidden

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

74 files changed

+447
-415
lines changed

‎Release/samples/BingRequest/BingRequest140.xp/BingRequest140.xp.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -32,27 +32,27 @@
3232
<ConfigurationType>Application</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
3434
<CharacterSet>NotSet</CharacterSet>
35-
<PlatformToolset>v120_xp</PlatformToolset>
35+
<PlatformToolset>v140_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>v120_xp</PlatformToolset>
41+
<PlatformToolset>v140_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>v120_xp</PlatformToolset>
48+
<PlatformToolset>v140_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>v120_xp</PlatformToolset>
55+
<PlatformToolset>v140_xp</PlatformToolset>
5656
</PropertyGroup>
5757
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5858
<Import Project="..\..\..\..\Build\Release.Product.Settings" />

‎Release/samples/BingRequest/BingRequest140/BingRequest140.vcxproj

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Debug|ARM">
8+
<ProjectConfiguration Include="Debug|ARM">
99
<Configuration>Debug</Configuration>
1010
<Platform>ARM</Platform>
1111
</ProjectConfiguration>
@@ -33,64 +33,62 @@
3333
<SccLocalPath>SAK</SccLocalPath>
3434
<SccProvider>SAK</SccProvider>
3535
<Keyword>Win32Proj</Keyword>
36-
<VCTargetsPath Condition="'$(VCTargetsPath12)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath12)</VCTargetsPath>
36+
<VCTargetsPath Condition="'$(VCTargetsPath12)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath12)</VCTargetsPath>
3737
</PropertyGroup>
3838
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
4141
<UseDebugLibraries>true</UseDebugLibraries>
4242
<CharacterSet>NotSet</CharacterSet>
43-
<PlatformToolset>v120</PlatformToolset>
43+
<PlatformToolset>v140</PlatformToolset>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4646
<ConfigurationType>Application</ConfigurationType>
4747
<UseDebugLibraries>true</UseDebugLibraries>
4848
<CharacterSet>NotSet</CharacterSet>
49-
<PlatformToolset>v120</PlatformToolset>
49+
<PlatformToolset>v140</PlatformToolset>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5252
<ConfigurationType>Application</ConfigurationType>
5353
<UseDebugLibraries>true</UseDebugLibraries>
5454
<CharacterSet>NotSet</CharacterSet>
55-
<PlatformToolset>v120</PlatformToolset>
55+
<PlatformToolset>v140</PlatformToolset>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5858
<ConfigurationType>Application</ConfigurationType>
5959
<UseDebugLibraries>false</UseDebugLibraries>
6060
<WholeProgramOptimization>true</WholeProgramOptimization>
6161
<CharacterSet>NotSet</CharacterSet>
62-
<PlatformToolset>v120</PlatformToolset>
62+
<PlatformToolset>v140</PlatformToolset>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
6565
<ConfigurationType>Application</ConfigurationType>
6666
<UseDebugLibraries>false</UseDebugLibraries>
6767
<WholeProgramOptimization>true</WholeProgramOptimization>
6868
<CharacterSet>NotSet</CharacterSet>
69-
<PlatformToolset>v120</PlatformToolset>
69+
<PlatformToolset>v140</PlatformToolset>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7272
<ConfigurationType>Application</ConfigurationType>
7373
<UseDebugLibraries>false</UseDebugLibraries>
7474
<WholeProgramOptimization>true</WholeProgramOptimization>
7575
<CharacterSet>NotSet</CharacterSet>
76-
<PlatformToolset>v120</PlatformToolset>
76+
<PlatformToolset>v140</PlatformToolset>
7777
</PropertyGroup>
7878
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
79-
8079
<!-- Normally these settings would be include by Release.Product.Settings,
8180
however they aren't to cover the case of a project without WIN32 defined -->
8281
<PropertyGroup>
83-
<BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
82+
<BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
8483
<OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
8584
<OutDir>$(OutputPath)</OutDir>
8685
<CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
8786
<CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
8887
</PropertyGroup>
89-
9088
<ImportGroup Label="ExtensionSettings" />
9189
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9290
<ClCompile>
93-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
91+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
9492
<PrecompiledHeader>NotUsing</PrecompiledHeader>
9593
<Optimization>Disabled</Optimization>
9694
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -104,7 +102,7 @@
104102
</ItemDefinitionGroup>
105103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
106104
<ClCompile>
107-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
105+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
108106
<PrecompiledHeader>NotUsing</PrecompiledHeader>
109107
<Optimization>Disabled</Optimization>
110108
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -118,7 +116,7 @@
118116
</ItemDefinitionGroup>
119117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
120118
<ClCompile>
121-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
119+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
122120
<PrecompiledHeader>NotUsing</PrecompiledHeader>
123121
<Optimization>Disabled</Optimization>
124122
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -132,7 +130,7 @@
132130
</ItemDefinitionGroup>
133131
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
134132
<ClCompile>
135-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
133+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
136134
<PrecompiledHeader>NotUsing</PrecompiledHeader>
137135
<Optimization>MaxSpeed</Optimization>
138136
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -150,7 +148,7 @@
150148
</ItemDefinitionGroup>
151149
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
152150
<ClCompile>
153-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
151+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
154152
<PrecompiledHeader>NotUsing</PrecompiledHeader>
155153
<Optimization>MaxSpeed</Optimization>
156154
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -168,7 +166,7 @@
168166
</ItemDefinitionGroup>
169167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
170168
<ClCompile>
171-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
169+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
172170
<PrecompiledHeader>NotUsing</PrecompiledHeader>
173171
<Optimization>MaxSpeed</Optimization>
174172
<FunctionLevelLinking>true</FunctionLevelLinking>

‎Release/samples/BingRequest/BingRequest140/BingRequest140.vcxproj.filters

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
</Filter>
77
</ItemGroup>
88
<ItemGroup>
9-
<ClCompile Include="$(CollateralsDir)\Samples\BingRequest\bingrequest.cpp">
10-
<Filter>Source Files</Filter>
11-
</ClCompile>
9+
<ClCompile Include="..\bingrequest.cpp" />
1210
</ItemGroup>
1311
</Project>

‎Release/samples/BlackJack/BlackJack_Client/BlackJack_Client140/BlackJack_Client140.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
55
<Configuration>Debug</Configuration>
@@ -41,40 +41,40 @@
4141
<ConfigurationType>Application</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
4343
<CharacterSet>NotSet</CharacterSet>
44-
<PlatformToolset>v120</PlatformToolset>
44+
<PlatformToolset>v140</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>true</UseDebugLibraries>
4949
<CharacterSet>NotSet</CharacterSet>
50-
<PlatformToolset>v120</PlatformToolset>
50+
<PlatformToolset>v140</PlatformToolset>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5353
<ConfigurationType>Application</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
5555
<CharacterSet>NotSet</CharacterSet>
56-
<PlatformToolset>v120</PlatformToolset>
56+
<PlatformToolset>v140</PlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5959
<ConfigurationType>Application</ConfigurationType>
6060
<UseDebugLibraries>false</UseDebugLibraries>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
<CharacterSet>NotSet</CharacterSet>
63-
<PlatformToolset>v120</PlatformToolset>
63+
<PlatformToolset>v140</PlatformToolset>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
6666
<ConfigurationType>Application</ConfigurationType>
6767
<UseDebugLibraries>false</UseDebugLibraries>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
<CharacterSet>NotSet</CharacterSet>
70-
<PlatformToolset>v120</PlatformToolset>
70+
<PlatformToolset>v140</PlatformToolset>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7373
<ConfigurationType>Application</ConfigurationType>
7474
<UseDebugLibraries>false</UseDebugLibraries>
7575
<WholeProgramOptimization>true</WholeProgramOptimization>
7676
<CharacterSet>NotSet</CharacterSet>
77-
<PlatformToolset>v120</PlatformToolset>
77+
<PlatformToolset>v140</PlatformToolset>
7878
</PropertyGroup>
7979
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8080
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
@@ -202,4 +202,4 @@
202202
</ProjectReference>
203203
</ItemGroup>
204204
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
205-
</Project>
205+
</Project>

‎Release/samples/BlackJack/BlackJack_Server/BlackJack_Server140/BlackJack_Server140.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -41,40 +41,40 @@
4141
<ConfigurationType>Application</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
4343
<CharacterSet>NotSet</CharacterSet>
44-
<PlatformToolset>v120</PlatformToolset>
44+
<PlatformToolset>v140</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>true</UseDebugLibraries>
4949
<CharacterSet>NotSet</CharacterSet>
50-
<PlatformToolset>v120</PlatformToolset>
50+
<PlatformToolset>v140</PlatformToolset>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5353
<ConfigurationType>Application</ConfigurationType>
5454
<UseDebugLibraries>false</UseDebugLibraries>
5555
<WholeProgramOptimization>true</WholeProgramOptimization>
5656
<CharacterSet>NotSet</CharacterSet>
57-
<PlatformToolset>v120</PlatformToolset>
57+
<PlatformToolset>v140</PlatformToolset>
5858
</PropertyGroup>
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6060
<ConfigurationType>Application</ConfigurationType>
6161
<UseDebugLibraries>false</UseDebugLibraries>
6262
<WholeProgramOptimization>true</WholeProgramOptimization>
6363
<CharacterSet>NotSet</CharacterSet>
64-
<PlatformToolset>v120</PlatformToolset>
64+
<PlatformToolset>v140</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
6767
<ConfigurationType>Application</ConfigurationType>
6868
<UseDebugLibraries>true</UseDebugLibraries>
6969
<CharacterSet>NotSet</CharacterSet>
70-
<PlatformToolset>v120</PlatformToolset>
70+
<PlatformToolset>v140</PlatformToolset>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
7373
<ConfigurationType>Application</ConfigurationType>
7474
<UseDebugLibraries>false</UseDebugLibraries>
7575
<WholeProgramOptimization>true</WholeProgramOptimization>
7676
<CharacterSet>NotSet</CharacterSet>
77-
<PlatformToolset>v120</PlatformToolset>
77+
<PlatformToolset>v140</PlatformToolset>
7878
</PropertyGroup>
7979
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8080
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />

‎Release/samples/BlackJack/BlackJack_Server/BlackJack_Server140/BlackJack_Server140.vcxproj.filters

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,31 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClInclude Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\messagetypes.h">
18+
<ClInclude Include="..\messagetypes.h">
1919
<Filter>Header Files</Filter>
2020
</ClInclude>
21-
<ClInclude Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\stdafx.h">
21+
<ClInclude Include="..\stdafx.h">
2222
<Filter>Header Files</Filter>
2323
</ClInclude>
24-
<ClInclude Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\Table.h">
24+
<ClInclude Include="..\Table.h">
2525
<Filter>Header Files</Filter>
2626
</ClInclude>
27-
<ClInclude Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\targetver.h">
27+
<ClInclude Include="..\targetver.h">
2828
<Filter>Header Files</Filter>
2929
</ClInclude>
3030
</ItemGroup>
3131
<ItemGroup>
32-
<ClCompile Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\BlackJack_Server.cpp">
32+
<ClCompile Include="..\BlackJack_Server.cpp">
3333
<Filter>Source Files</Filter>
3434
</ClCompile>
35-
<ClCompile Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\Dealer.cpp">
35+
<ClCompile Include="..\Dealer.cpp">
3636
<Filter>Source Files</Filter>
3737
</ClCompile>
38-
<ClCompile Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\stdafx.cpp">
38+
<ClCompile Include="..\stdafx.cpp">
3939
<Filter>Source Files</Filter>
4040
</ClCompile>
41-
<ClCompile Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\hosting_hooks.cpp">
41+
<ClCompile Include="..\Table.cpp">
4242
<Filter>Source Files</Filter>
4343
</ClCompile>
44-
<ClCompile Include="$(CollateralsDir)\Samples\BlackJack_Server\BlackJack_Server\Table.cpp">
45-
<Filter>Source Files</Filter>
46-
</ClCompile>
47-
</ItemGroup>
48-
<ItemGroup>
49-
<Text Include="..\..\..\..\collateral\samples\BlackJack_Server\VC11\BlackJack_Server\actors_config.cfg" />
5044
</ItemGroup>
5145
</Project>

0 commit comments

Comments
 (0)