diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 1 | ||||
| -rw-r--r-- | support/hololens/ServoApp/DefaultUrl.h | 3 | ||||
| -rw-r--r-- | support/hololens/ServoApp/Package.appxmanifest | 2 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj | 3 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj.filters | 1 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoControl/ServoControl.h | 3 |
7 files changed, 12 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index ba1ba3c1d66..142ce91e4b5 100644 --- a/.gitignore +++ b/.gitignore @@ -58,4 +58,5 @@ support/hololens/ServoApp/support/ support/hololens/ServoApp/Debug/ support/hololens/ServoApp/Release/ support/hololens/packages/ +support/hololens/AppPackages/ support/hololens/.vs/ diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 3afe06390cf..c78bbc29019 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -747,6 +747,7 @@ class MachCommands(CommandBase): "support/hololens/ServoApp/Debug/", "support/hololens/ServoApp/Release/", "support/hololens/packages/", + "support/hololens/AppPackages/", ] for uwp_artifact in uwp_artifacts: diff --git a/support/hololens/ServoApp/DefaultUrl.h b/support/hololens/ServoApp/DefaultUrl.h new file mode 100644 index 00000000000..359a7962dbd --- /dev/null +++ b/support/hololens/ServoApp/DefaultUrl.h @@ -0,0 +1,3 @@ +#pragma once + +#define DEFAULT_URL L"about:blank"; diff --git a/support/hololens/ServoApp/Package.appxmanifest b/support/hololens/ServoApp/Package.appxmanifest index a8363f8d0fa..5c706ebafaa 100644 --- a/support/hololens/ServoApp/Package.appxmanifest +++ b/support/hololens/ServoApp/Package.appxmanifest @@ -37,5 +37,7 @@ </Applications> <Capabilities> <Capability Name="internetClient" /> + <Capability Name="codeGeneration" /> + <Capability Name="privateNetworkClientServer" /> </Capabilities> </Package>
\ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 201c4955edf..ad16700df6b 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -128,6 +128,7 @@ <ClInclude Include="ServoControl\OpenGLES.h" /> <ClInclude Include="ServoControl\Servo.h" /> <ClInclude Include="ServoControl\ServoControl.h" /> + <ClInclude Include="DefaultUrl.h" /> </ItemGroup> <ItemGroup> <ApplicationDefinition Include="App.xaml"> @@ -981,4 +982,4 @@ <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'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index d4f1f4a9de7..73859388feb 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -37,6 +37,7 @@ <ClInclude Include="ServoControl\ServoControl.h"> <Filter>ServoControl</Filter> </ClInclude> + <ClInclude Include="DefaultUrl.h" /> </ItemGroup> <ItemGroup> <Image Include="Assets\Wide310x150Logo.scale-200.png"> diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h index 9c38cec5efb..e13e3b0c69b 100644 --- a/support/hololens/ServoApp/ServoControl/ServoControl.h +++ b/support/hololens/ServoApp/ServoControl/ServoControl.h @@ -2,6 +2,7 @@ #include "ServoControl.g.h" #include "OpenGLES.h" #include "Servo.h" +#include "DefaultUrl.h" namespace winrt::ServoApp::implementation { struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate { @@ -95,7 +96,7 @@ private: winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent; float mDPI = 1; - hstring mInitialURL = L"about:blank"; + hstring mInitialURL = DEFAULT_URL; bool mTransient = false; Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel(); |