diff --git a/Build/Microsoft.Xbox.Services.140.XDK.WinRT/Build.Durango.Cpp.props b/Build/Microsoft.Xbox.Services.110.XDK.WinRT/Build.Durango.Cpp.props similarity index 100% rename from Build/Microsoft.Xbox.Services.140.XDK.WinRT/Build.Durango.Cpp.props rename to Build/Microsoft.Xbox.Services.110.XDK.WinRT/Build.Durango.Cpp.props diff --git a/Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.sln b/Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.sln similarity index 74% rename from Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.sln rename to Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.sln index 04120d75..1594bc65 100644 --- a/Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.sln +++ b/Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.sln @@ -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 diff --git a/Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.vcxproj b/Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj similarity index 99% rename from Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.vcxproj rename to Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj index 3dd39949..32f4436c 100644 --- a/Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.vcxproj +++ b/Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,16 +18,15 @@ Microsoft.Xbox.Services Microsoft.Xbox.Services en-US - 14.0 + 11.0 true true DynamicLibrary false false - x64 - v140 + v110 @@ -720,7 +719,7 @@ - + {e621c269-d177-4c1b-80ea-c0a274b7a151} diff --git a/Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.vcxproj.filters b/Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj.filters similarity index 100% rename from Build/Microsoft.Xbox.Services.140.XDK.WinRT/Microsoft.Xbox.Services.140.XDK.WinRT.vcxproj.filters rename to Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj.filters diff --git a/External/cpprestsdk b/External/cpprestsdk index 2f729336..9cd38902 160000 --- a/External/cpprestsdk +++ b/External/cpprestsdk @@ -1 +1 @@ -Subproject commit 2f7293363acf643c0e2a681fdcb13c6165248a91 +Subproject commit 9cd389021a8952faee884586c7533551ea958f40 diff --git a/Include/xsapi/types.h b/Include/xsapi/types.h index b0d26645..f555a1f3 100644 --- a/Include/xsapi/types.h +++ b/Include/xsapi/types.h @@ -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)