Readded 110.XDK.WinRT and removed 140.XDK.WinRT projects (#71)
* Readded 110.XDK.WinRT project and removed 140.XDK.WinRT project * Made deprecated tag only apply for newer visual studio versions
This commit is contained in:
Родитель
23c9e8679b
Коммит
17c586336e
|
@ -1,14 +1,9 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Xbox.Services.140.XDK.WinRT", "Microsoft.Xbox.Services.140.XDK.WinRT.vcxproj", "{9BF96BF1-7E60-49B7-A137-E6C961A28336}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E621C269-D177-4C1B-80EA-C0A274B7A151} = {E621C269-D177-4C1B-80EA-C0A274B7A151}
|
||||
EndProjectSection
|
||||
# Visual Studio 2012
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Xbox.Services.110.XDK.WinRT", "Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj", "{9BF96BF1-7E60-49B7-A137-E6C961A28336}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca140.xbox", "..\..\External\cpprestsdk\Release\src\build\vs14.xbox\casablanca140.Xbox.vcxproj", "{E621C269-D177-4C1B-80EA-C0A274B7A151}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110.xbox", "..\..\External\cpprestsdk\Release\src\build\vs11.xbox\casablanca110.Xbox.vcxproj", "{E621C269-D177-4C1B-80EA-C0A274B7A151}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Durango">
|
||||
<Configuration>Debug</Configuration>
|
||||
|
@ -18,16 +18,15 @@
|
|||
<ProjectName>Microsoft.Xbox.Services</ProjectName>
|
||||
<RootNamespace>Microsoft.Xbox.Services</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
|
||||
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
|
||||
<AppContainerApplication Condition="'$(Platform)'!='Durango'">true</AppContainerApplication>
|
||||
<ConsumeWinRT>true</ConsumeWinRT>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseXboxServices>false</UseXboxServices>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Configuration">
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
||||
|
@ -720,7 +719,7 @@
|
|||
<ClInclude Include="..\..\Source\System\system_internal.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\External\cpprestsdk\Release\src\build\vs14.xbox\casablanca140.Xbox.vcxproj">
|
||||
<ProjectReference Include="..\..\External\cpprestsdk\Release\src\build\vs11.xbox\casablanca110.Xbox.vcxproj">
|
||||
<Project>{e621c269-d177-4c1b-80ea-c0a274b7a151}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
|
@ -1 +1 @@
|
|||
Subproject commit 2f7293363acf643c0e2a681fdcb13c6165248a91
|
||||
Subproject commit 9cd389021a8952faee884586c7533551ea958f40
|
|
@ -56,7 +56,11 @@
|
|||
#if defined _WIN32
|
||||
#ifdef _NO_XSAPIIMP
|
||||
#define _XSAPIIMP
|
||||
#define _XSAPIIMP_DEPRECATED __declspec(deprecated)
|
||||
#if _MSC_VER >= 1900
|
||||
#define _XSAPIIMP_DEPRECATED __declspec(deprecated)
|
||||
#else
|
||||
#define _XSAPIIMP_DEPRECATED
|
||||
#endif
|
||||
#else
|
||||
#ifdef _XSAPIIMP_EXPORT
|
||||
#define _XSAPIIMP __declspec(dllexport)
|
||||
|
|
Загрузка…
Ссылка в новой задаче