mirror of
https://github.com/servo/servo.git
synced 2025-06-29 03:23:41 +01:00
Use OpenXR Loader from NuGet
This commit is contained in:
Manish Goregaokar
parent
068997cd30
commit
92bddf081d
4 changed files with 7 additions and 58 deletions
|
|
@ -693,12 +693,6 @@ class MachCommands(CommandBase):
|
|||
if not package_gstreamer_dlls(env, servo_exe_dir, target_triple, uwp):
|
||||
status = 1
|
||||
|
||||
if uwp:
|
||||
# copy needed openxr DLLs in to servo.exe dir
|
||||
print("Packaging openxr DLLs")
|
||||
if not self.package_openxr_dlls(env, servo_exe_dir, target_triple):
|
||||
status = 1
|
||||
|
||||
# UWP app packaging already bundles all required DLLs for us.
|
||||
print("Packaging MSVC DLLs")
|
||||
if not package_msvc_dlls(servo_exe_dir, target_triple, vcinstalldir, vs_version):
|
||||
|
|
@ -753,29 +747,6 @@ class MachCommands(CommandBase):
|
|||
opts += params
|
||||
return check_call(["cargo", "clean"] + opts, env=self.build_env(), verbose=verbose)
|
||||
|
||||
def package_openxr_dlls(self, env, servo_exe_dir, target):
|
||||
target_arch = target.split('-')[0]
|
||||
if target_arch == "aarch64":
|
||||
arch = "arm64"
|
||||
elif target_arch == "x86_64":
|
||||
arch = "x64"
|
||||
else:
|
||||
print("ERROR: We do not have openxr_loader DLLs for %s" % target_arch)
|
||||
return False
|
||||
|
||||
# The package on S3 contains both debug and release DLLs, but
|
||||
# by default we only use release DLLs. If you need to debug OpenXR itself,
|
||||
# change this to Debug.
|
||||
dll_path = os.path.join(self.msvc_package_dir("openxr-loader-uwp"), arch, "Release", "openxr_loader.dll")
|
||||
|
||||
try:
|
||||
shutil.copy(dll_path, servo_exe_dir)
|
||||
except:
|
||||
print("ERROR: Could not find %s" % dll_path)
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def angle_root(target, nuget_env):
|
||||
arch = {
|
||||
|
|
|
|||
|
|
@ -1,5 +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\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2\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>
|
||||
|
|
@ -316,9 +317,7 @@
|
|||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\intl-8.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\openxr_loader.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
|
||||
</None>
|
||||
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\libcrypto.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
|
||||
</None>
|
||||
|
|
@ -499,9 +498,6 @@
|
|||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\intl-8.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\openxr_loader.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\libcrypto.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
|
||||
</None>
|
||||
|
|
@ -708,13 +704,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\debug\openxr_loader.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</DeploymentContent>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\debug\libcrypto.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
|
||||
|
|
@ -742,9 +731,6 @@
|
|||
</DeploymentContent>
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\release\openxr_loader.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="..\..\..\target\release\avcodec-58.dll">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||
</None>
|
||||
|
|
@ -978,6 +964,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\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
|
|
@ -986,5 +973,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\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props'))" />
|
||||
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -67,9 +67,6 @@
|
|||
<ItemGroup>
|
||||
<None Include="ServoApp_TemporaryKey.pfx" />
|
||||
<None Include="packages.config" />
|
||||
<None Include="..\..\..\target\debug\openxr_loader.dll">
|
||||
<Filter>DebugServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\debug\libcrypto.dll">
|
||||
<Filter>DebugServoDLLs</Filter>
|
||||
</None>
|
||||
|
|
@ -82,18 +79,12 @@
|
|||
<None Include="..\..\..\target\debug\simpleservo.dll">
|
||||
<Filter>DebugServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\release\openxr_loader.dll">
|
||||
<Filter>ReleaseServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\release\libcrypto.dll">
|
||||
<Filter>ReleaseServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\release\libssl.dll">
|
||||
<Filter>ReleaseServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\openxr_loader.dll">
|
||||
<Filter>DebugARM64ServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\libcrypto.dll">
|
||||
<Filter>DebugARM64ServoDLLs</Filter>
|
||||
</None>
|
||||
|
|
@ -103,9 +94,6 @@
|
|||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\simpleservo.dll">
|
||||
<Filter>DebugARM64ServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\openxr_loader.dll">
|
||||
<Filter>ReleaseARM64ServoDLLs</Filter>
|
||||
</None>
|
||||
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\libcrypto.dll">
|
||||
<Filter>ReleaseARM64ServoDLLs</Filter>
|
||||
</None>
|
||||
|
|
|
|||
|
|
@ -2,4 +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" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue