diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-07-22 22:12:05 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-07-23 09:41:59 -0400 |
| commit | 157077c8265f799c0b609ca5d170c09c57fa8e48 (patch) | |
| tree | a07f7a713105d2fdc89a842a0cf4fb3f3adbfae9 | |
| parent | fdbb317d7a241928d08e40dfd5b0ae3003ecba51 (diff) | |
| download | servo-157077c8265f799c0b609ca5d170c09c57fa8e48.tar.gz servo-157077c8265f799c0b609ca5d170c09c57fa8e48.zip | |
Use Servo's ANGLE fork for UWP.
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj | 6 | ||||
| -rw-r--r-- | support/hololens/ServoApp/packages.config | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 814fa36b76e..9a0043454c8 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -249,7 +249,7 @@ class MachCommands(CommandBase): append_to_path_env( path.join( os.getcwd(), "support", "hololens", "packages", - "ANGLE.WindowsStore.2.1.13", "bin", "UAP", "x64" + "ANGLE.WindowsStore.Servo.2.1.13", "bin", "UAP", "x64" ), env, "LIB" diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index fcfb8e67c13..51ea17eee62 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -561,7 +561,7 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <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.2.1.13\build\native\ANGLE.WindowsStore.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.2.1.13\build\native\ANGLE.WindowsStore.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')" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> @@ -569,6 +569,6 @@ </PropertyGroup> <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.2.1.13\build\native\ANGLE.WindowsStore.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.2.1.13\build\native\ANGLE.WindowsStore.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'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/support/hololens/ServoApp/packages.config b/support/hololens/ServoApp/packages.config index b3c6a3cc0c6..7270aa2d3dc 100644 --- a/support/hololens/ServoApp/packages.config +++ b/support/hololens/ServoApp/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="ANGLE.WindowsStore" version="2.1.13" targetFramework="native" /> + <package id="ANGLE.WindowsStore.Servo" version="2.1.13" targetFramework="native" /> <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" /> -</packages>
\ No newline at end of file +</packages> |