diff --git a/.gitignore b/.gitignore
index d3721023fe5..f0391264e09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,8 +48,10 @@ capture_webrender/
support/hololens/x64/
support/hololens/ARM/
+support/hololens/ARM64/
support/hololens/ServoApp/x64/
support/hololens/ServoApp/ARM/
+support/hololens/ServoApp/ARM64/
support/hololens/ServoApp/Generated\ Files
# Ignore thumbnails created by Windows
diff --git a/support/hololens/ServoApp.sln b/support/hololens/ServoApp.sln
index af25f2d8d80..8a585d5bb7d 100644
--- a/support/hololens/ServoApp.sln
+++ b/support/hololens/ServoApp.sln
@@ -8,9 +8,11 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
@@ -18,6 +20,9 @@ Global
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|ARM.ActiveCfg = Debug|ARM
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|ARM.Build.0 = Debug|ARM
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|ARM.Deploy.0 = Debug|ARM
+ {0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|ARM64.Build.0 = Debug|ARM64
+ {0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|ARM64.Deploy.0 = Debug|ARM64
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|x64.ActiveCfg = Debug|x64
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|x64.Build.0 = Debug|x64
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|x64.Deploy.0 = Debug|x64
@@ -27,6 +32,9 @@ Global
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM.ActiveCfg = Release|ARM
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM.Build.0 = Release|ARM
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM.Deploy.0 = Release|ARM
+ {0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.ActiveCfg = Release|ARM64
+ {0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.Build.0 = Release|ARM64
+ {0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.Deploy.0 = Release|ARM64
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|x64.ActiveCfg = Release|x64
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|x64.Build.0 = Release|x64
{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|x64.Deploy.0 = Release|x64
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index fcfb8e67c13..3d89bb42e31 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -21,6 +21,10 @@
Debug
ARM
+
+ Debug
+ ARM64
+
Debug
Win32
@@ -33,6 +37,10 @@
Release
ARM
+
+ Release
+ ARM64
+
Release
Win32
@@ -88,11 +96,14 @@
_DEBUG;%(PreprocessorDefinitions)
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\debug\
+ $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\aarch64-pc-windows-msvc\debug\
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\debug\
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\debug\
WindowsApp.lib;%(AdditionalDependencies);simpleservo.dll.lib
+ WindowsApp.lib;%(AdditionalDependencies);simpleservo.dll.lib
+ $(ProjectDir)\..\..\..\target\aarch64-pc-windows-msvc\debug\
WindowsApp.lib;%(AdditionalDependencies);simpleservo.dll.lib
@@ -106,11 +117,14 @@
NDEBUG;%(PreprocessorDefinitions)
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\release
+ $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\aarch64-pc-windows-msvc\release
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\release
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\release
WindowsApp.lib;%(AdditionalDependencies);simpleservo.dll.lib
+ WindowsApp.lib;%(AdditionalDependencies);simpleservo.dll.lib
+ $(ProjectDir)\..\..\..\target\aarch64-pc-windows-msvc\release\
WindowsApp.lib;%(AdditionalDependencies);simpleservo.dll.lib
@@ -153,347 +167,853 @@
Designer
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
+
+ true
+ true
+ false
+
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
true
+ true
+ false
+ true
+ false
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 604bb785585..770a7f897fe 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -432,6 +432,36 @@
DebugServoDLLs
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
@@ -449,6 +479,12 @@
{83d6e7af-b929-4869-804e-571256af2969}
+
+ {e372e8ac-7cab-47de-80a5-020370a51fd4}
+
+
+ {384b4019-d076-4301-994d-a891969a3036}
+