Add ARM64 to build window

keveleigh · keveleigh · commit e6ea11c51e73 · 2019-12-13T13:43:22.000-08:00
diff --git a/Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/BuildDeployWindow.cs b/Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/BuildDeployWindow.cs
@@ -39,6 +39,9 @@ private enum Architecture
             x86 = 0,
             x64 = 1,
             ARM = 2,
+#if UNITY_2019_1_OR_NEWER
+            ARM64 = 3
+#endif // UNITY_2019_1_OR_NEWER
         }
 
         private enum PlatformToolset
@@ -584,6 +587,12 @@ private void AppxBuildGUI()
             {
                 buildArchitecture = Architecture.ARM;
             }
+#if UNITY_2019_1_OR_NEWER
+            else if (currentArchitectureString.ToLower().Equals("arm64"))
+            {
+                buildArchitecture = Architecture.ARM64;
+            }
+#endif // UNITY_2019_1_OR_NEWER
 
             buildArchitecture = (Architecture)EditorGUILayout.EnumPopup("Build Platform", buildArchitecture, GUILayout.Width(HALF_WIDTH));
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ private enum Architecture`
`39`	`39`	`x86 = 0,`
`40`	`40`	`x64 = 1,`
`41`	`41`	`ARM = 2,`
	`42`	`+#if UNITY_2019_1_OR_NEWER`
	`43`	`+ ARM64 = 3`
	`44`	`+#endif // UNITY_2019_1_OR_NEWER`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`private enum PlatformToolset`
`@@ -584,6 +587,12 @@ private void AppxBuildGUI()`
`584`	`587`	`{`
`585`	`588`	`buildArchitecture = Architecture.ARM;`
`586`	`589`	`}`
	`590`	`+#if UNITY_2019_1_OR_NEWER`
	`591`	`+ else if (currentArchitectureString.ToLower().Equals("arm64"))`
	`592`	`+ {`
	`593`	`+ buildArchitecture = Architecture.ARM64;`
	`594`	`+ }`
	`595`	`+#endif // UNITY_2019_1_OR_NEWER`
`587`	`596`
`588`	`597`	`buildArchitecture = (Architecture)EditorGUILayout.EnumPopup("Build Platform", buildArchitecture, GUILayout.Width(HALF_WIDTH));`
`589`	`598`