Fixing WinRT build issue (#187)

Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj

@@ -797,7 +797,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_VARIADIC_MAX=10;ENABLE_INTSAFE_SIGNED_FUNCTIONS;_NO_XSAPIIMP;_NO_ASYNCRTIMP;_NO_PPLXIMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_VARIADIC_MAX=10;_WINRT_DLL;ENABLE_INTSAFE_SIGNED_FUNCTIONS;_NO_XSAPIIMP;_NO_ASYNCRTIMP;_NO_PPLXIMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>

Source/Shared/utils.cpp

@@ -24,7 +24,7 @@
 #include "initiator.h"
 
 #if UWP_API
-#ifdef __cplusplus_winrt
+#ifdef _WINRT_DLL
 #include "WinRT/User_WinRT.h"
 #endif
 #endif
@@ -72,7 +72,7 @@ xsapi_singleton::xsapi_singleton()
 void xsapi_singleton::init()
 {
 #if UWP_API
-#ifdef __cplusplum_winrt
+#ifdef _WINRT_DLL
     m_userEventBind = std::make_shared<Microsoft::Xbox::Services::System::UserEventBind>();
 #endif
 #endif

Source/Shared/utils.h

@@ -64,7 +64,7 @@ NAMESPACE_MICROSOFT_XBOX_SERVICES_PRESENCE_CPP_BEGIN
 NAMESPACE_MICROSOFT_XBOX_SERVICES_PRESENCE_CPP_END
 #endif
 
-#ifdef __cplusplus_winrt
+#ifdef _WINRT_DLL
     NAMESPACE_MICROSOFT_XBOX_SERVICES_MULTIPLAYER_MANAGER_BEGIN
         ref class MultiplayerManager;
     NAMESPACE_MICROSOFT_XBOX_SERVICES_MULTIPLAYER_MANAGER_END
@@ -184,7 +184,7 @@ struct xsapi_singleton
 
     std::shared_ptr<initiator> m_initiator;
 
-#ifdef __cplusplus_winrt
+#if _WINRT_DLL
     // from Services\Multiplayer\Manager\WinRT\MultiplayerManager_WinRT.cpp
     Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerManager^ m_winrt_multiplayerManagerInstance;
     Microsoft::Xbox::Services::Social::Manager::SocialManager^ m_winrt_socialManagerInstance;

Utilities/CMake/template-Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj

@@ -60,7 +60,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_VARIADIC_MAX=10;ENABLE_INTSAFE_SIGNED_FUNCTIONS;_NO_XSAPIIMP;_NO_ASYNCRTIMP;_NO_PPLXIMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_VARIADIC_MAX=10;_WINRT_DLL;ENABLE_INTSAFE_SIGNED_FUNCTIONS;_NO_XSAPIIMP;_NO_ASYNCRTIMP;_NO_PPLXIMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>