Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24453 - jdm:openxr-update, r=Manishearth

Browse source 
Update OpenXR loader package

This fixes two outstanding WACK errors.
This commit is contained in:
bors-servo 2019-10-18 00:51:15 -04:00 • committed by GitHub
commit 578d9a7fb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

28
support/hololens/ServoApp/ServoApp.vcxproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" />
<Import Project="..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
@ -302,9 +302,6 @@
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\libssl.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\msvcp140.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\orc-0.4-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None>
@ -320,9 +317,6 @@
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\swscale-5.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\vcruntime140.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\x264-157.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None>
@ -482,9 +476,6 @@
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\libssl.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\msvcp140.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\orc-0.4-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
@ -500,9 +491,6 @@
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\swscale-5.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\vcruntime140.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\x264-157.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
@ -663,9 +651,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</DeploymentContent>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\msvcp140.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\orc-0.4-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
@ -692,9 +677,6 @@
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\swscale-5.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\vcruntime140.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\x264-157.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
@ -966,7 +948,7 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" />
<Import Project="..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" />
<Import Project="..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@ -975,7 +957,7 @@
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets'))" />
</Target>
</Project>
</Project>

21
support/hololens/ServoApp/ServoApp.vcxproj.filters
View file

@ -191,18 +191,6 @@
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\msvcp140.dll">
<Filter>ReleaseServoDLLs</Filter>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\msvcp140.dll">
<Filter>ReleaseARM64ServoDLLs</Filter>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\vcruntime140.dll">
<Filter>ReleaseARM64ServoDLLs</Filter>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\msvcp140.dll">
<Filter>DebugARM64ServoDLLs</Filter>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\vcruntime140.dll">
<Filter>DebugARM64ServoDLLs</Filter>
</None>
<None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\avcodec-58.dll">
<Filter>DebugARM64ServoDLLs</Filter>
</None>
@ -626,12 +614,6 @@
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\libssl.dll">
<Filter>DebugServoDLLs</Filter>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\vcruntime140.dll">
<Filter>DebugServoDLLs</Filter>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\msvcp140.dll">
<Filter>DebugServoDLLs</Filter>
</None>
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\bz2.dll">
<Filter>ReleaseServoDLLs</Filter>
</None>
@ -878,6 +860,7 @@
<None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\swresample-3.dll">
<Filter>ReleaseServoDLLs</Filter>
</None>
<None Include="$(OpenXRLoaderBinaryRoot)\bin\openxr_loader.dll" />
</ItemGroup>
<ItemGroup>
<Filter Include="Assets">
@ -914,4 +897,4 @@
<ItemGroup>
<ApplicationDefinition Include="App.xaml" />
</ItemGroup>
</Project>
</Project>

2
support/hololens/ServoApp/packages.config
View file

@ -2,5 +2,5 @@
<packages>
<package id="ANGLE.WindowsStore.Servo" version="2.1.13" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
<package id="OpenXR.Loader" version="1.0.2.1" targetFramework="native" />
<package id="OpenXR.Loader" version="1.0.3" targetFramework="native" />
</packages>