(MSVC 2017 UWP) Buildfix

(MSVC 2017 UWP) Renaming

audio/drivers/xaudio.c

@@ -201,10 +201,8 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
 {
    xaudio2_t *handle = NULL;
    WAVEFORMATEX wfx  = {0};
-   HRESULT hr;
-
-#ifndef _XBOX
-   hr = CoInitialize(NULL);
+#if !defined(_XBOX) && !defined(__WINRT__)
+   HRESULT hr        = CoInitialize(NULL);
    if (FAILED(hr))
       return NULL;
 #endif
@@ -258,7 +256,7 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
 
 error:
    xaudio2_free(handle);
-#ifndef _XBOX
+#if !defined(_XBOX) && !defined(__WINRT__)
    CoUninitialize();
 #endif
    return NULL;
@@ -411,7 +409,7 @@ static void xa_free(void *data)
       xaudio2_free(xa->xa);
    free(xa);
 
-#ifndef _XBOX
+#if !defined(_XBOX) && !defined(__WINRT__)
    CoUninitialize();
 #endif
 }

pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
     <ProjectGuid>{cc7b9a23-bd64-4eb9-9d8f-f5115fb8960f}</ProjectGuid>
-    <RootNamespace>RetroArchUWP_cores_nonfree</RootNamespace>
+    <RootNamespace>RetroArch_msvc2017_UWP_cores_nonfree</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -118,7 +118,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>..\RetroArch-UWP\RetroArch-UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\msvc2017-UWP\RetroArch-msvc2017-UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
@@ -227,4 +227,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

pkg/msvc-uwp/RetroArch-msvc2017-UWP.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.168
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-UWP", "RetroArch-UWP\RetroArch-UWP.vcxproj", "{F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2017-UWP", "RetroArch-msvc2017-UWP\RetroArch-msvc2017-UWP.vcxproj", "{F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-UWP-cores-nonfree", "RetroArch-UWP-cores-nonfree\RetroArch-UWP-cores-nonfree.vcxproj", "{CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2017-UWP-cores-nonfree", "RetroArch-msvc2017-UWP-cores-nonfree\RetroArch-msvc2017-UWP-cores-nonfree.vcxproj", "{CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution