Fix build script for macos aarch64. (#2420)

* Fix build script for macos aarch64.

* fix1

* Fix2.

* update vs files

Co-authored-by: Yong He <yhe@nvidia.com>

1 files changed, 26 insertions, 18 deletions

diff --git a/build/visual-studio/example-base/example-base.vcxproj b/build/visual-studio/example-base/example-base.vcxproj
index bef105477..5288704e0 100644
--- a/build/visual-studio/example-base/example-base.vcxproj
+++ b/build/visual-studio/example-base/example-base.vcxproj
@@ -9,9 +9,9 @@
       <Configuration>Debug</Configuration>

       <Platform>x64</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|ARM">

+    <ProjectConfiguration Include="Debug|ARM64">

       <Configuration>Debug</Configuration>

-      <Platform>ARM</Platform>

+      <Platform>ARM64</Platform>

     </ProjectConfiguration>

     <ProjectConfiguration Include="Debug aarch64|Win32">

       <Configuration>Debug aarch64</Configuration>

@@ -21,9 +21,9 @@
       <Configuration>Debug aarch64</Configuration>

       <Platform>x64</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug aarch64|ARM">

+    <ProjectConfiguration Include="Debug aarch64|ARM64">

       <Configuration>Debug aarch64</Configuration>

-      <Platform>ARM</Platform>

+      <Platform>ARM64</Platform>

     </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

@@ -33,9 +33,9 @@
       <Configuration>Release</Configuration>

       <Platform>x64</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|ARM">

+    <ProjectConfiguration Include="Release|ARM64">

       <Configuration>Release</Configuration>

-      <Platform>ARM</Platform>

+      <Platform>ARM64</Platform>

     </ProjectConfiguration>

     <ProjectConfiguration Include="Release aarch64|Win32">

       <Configuration>Release aarch64</Configuration>

@@ -45,9 +45,9 @@
       <Configuration>Release aarch64</Configuration>

       <Platform>x64</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Release aarch64|ARM">

+    <ProjectConfiguration Include="Release aarch64|ARM64">

       <Configuration>Release aarch64</Configuration>

-      <Platform>ARM</Platform>

+      <Platform>ARM64</Platform>

     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

@@ -69,12 +69,12 @@
     <CharacterSet>Unicode</CharacterSet>

     <PlatformToolset>v142</PlatformToolset>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM'" Label="Configuration">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM64'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <CharacterSet>Unicode</CharacterSet>

     <PlatformToolset>v142</PlatformToolset>

-    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>

+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

@@ -88,12 +88,12 @@
     <CharacterSet>Unicode</CharacterSet>

     <PlatformToolset>v142</PlatformToolset>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM'" Label="Configuration">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <CharacterSet>Unicode</CharacterSet>

     <PlatformToolset>v142</PlatformToolset>

-    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>

+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -104,7 +104,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM'">

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -113,7 +113,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM'">

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

@@ -129,7 +129,7 @@
     <TargetName>example-base</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM'">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM64'">

     <OutDir>..\..\..\bin\windows-aarch64\debug\</OutDir>

     <IntDir>..\..\..\intermediate\windows-aarch64\debug\example-base\</IntDir>

     <TargetName>example-base</TargetName>

@@ -147,7 +147,7 @@
     <TargetName>example-base</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM'">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'">

     <OutDir>..\..\..\bin\windows-aarch64\release\</OutDir>

     <IntDir>..\..\..\intermediate\windows-aarch64\release\example-base\</IntDir>

     <TargetName>example-base</TargetName>

@@ -183,7 +183,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

     </Link>

   </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM'">

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM64'">

     <ClCompile>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

@@ -192,11 +192,15 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

     </Link>

+    <Lib>

+      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>

+    </Lib>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

@@ -236,7 +240,7 @@
       <OptimizeReferences>true</OptimizeReferences>

     </Link>

   </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM'">

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'">

     <ClCompile>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

@@ -248,12 +252,16 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

     </Link>

+    <Lib>

+      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>

+    </Lib>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\examples\example-base\example-base.h" />