Fix release CI script. (#2421)

* Fix release CI script.

* Fix vs

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

34 files changed, 1 insertions, 160 deletions

diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj
index 9590775a1..6ec843679 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj
@@ -189,15 +189,11 @@
       <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>

@@ -246,16 +242,12 @@
       <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="..\..\..\source\compiler-core\slang-artifact-associated-impl.h" />

diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj
index 0c2efd389..59d378b0e 100644
--- a/build/visual-studio/core/core.vcxproj
+++ b/build/visual-studio/core/core.vcxproj
@@ -189,15 +189,11 @@
       <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>
@@ -246,16 +242,12 @@
       <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="..\..\..\source\core\slang-allocator.h" />
diff --git a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj
index b6a709154..92f70a818 100644
--- a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj
+++ b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj
index 59398e28e..1d6b38aa9 100644
--- a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj
+++ b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/example-base/example-base.vcxproj b/build/visual-studio/example-base/example-base.vcxproj
index 5288704e0..59f1919be 100644
--- a/build/visual-studio/example-base/example-base.vcxproj
+++ b/build/visual-studio/example-base/example-base.vcxproj
@@ -192,15 +192,11 @@
       <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>

@@ -252,16 +248,12 @@
       <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" />

diff --git a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj
index 1f7bb2722..a346900c6 100644
--- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj
+++ b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj
@@ -200,13 +200,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\gfx-unit-test-tool.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -261,14 +259,12 @@
       <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>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\gfx-unit-test-tool.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/gfx-util/gfx-util.vcxproj b/build/visual-studio/gfx-util/gfx-util.vcxproj
index 0dd28be10..56257acf1 100644
--- a/build/visual-studio/gfx-util/gfx-util.vcxproj
+++ b/build/visual-studio/gfx-util/gfx-util.vcxproj
@@ -192,15 +192,11 @@
       <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>

@@ -252,16 +248,12 @@
       <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="..\..\..\tools\gfx-util\shader-cursor.h" />

diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj
index 05e70cc78..db0dfc5e4 100644
--- a/build/visual-studio/gfx/gfx.vcxproj
+++ b/build/visual-studio/gfx/gfx.vcxproj
@@ -216,14 +216,12 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\gfx.lib</ImportLibrary>

       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>

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

     </Link>

     <PostBuildEvent>

       <Command>IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\debug" &gt; nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\debug" &gt; nul)

@@ -298,7 +296,6 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -306,7 +303,6 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi
       <OptimizeReferences>true</OptimizeReferences>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\gfx.lib</ImportLibrary>

       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>

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

     </Link>

     <PostBuildEvent>

       <Command>IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\release" &gt; nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\release" &gt; nul)

diff --git a/build/visual-studio/gpu-printing/gpu-printing.vcxproj b/build/visual-studio/gpu-printing/gpu-printing.vcxproj
index a8cee6f95..9e8636769 100644
--- a/build/visual-studio/gpu-printing/gpu-printing.vcxproj
+++ b/build/visual-studio/gpu-printing/gpu-printing.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/hello-world/hello-world.vcxproj b/build/visual-studio/hello-world/hello-world.vcxproj
index a5d7c380f..ccf3da9ac 100644
--- a/build/visual-studio/hello-world/hello-world.vcxproj
+++ b/build/visual-studio/hello-world/hello-world.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/lz4/lz4.vcxproj b/build/visual-studio/lz4/lz4.vcxproj
index 192385a54..69b55e20c 100644
--- a/build/visual-studio/lz4/lz4.vcxproj
+++ b/build/visual-studio/lz4/lz4.vcxproj
@@ -189,15 +189,11 @@
       <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>

@@ -246,16 +242,12 @@
       <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="..\..\..\external\lz4\lib\lz4.h" />

diff --git a/build/visual-studio/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj
index 8e51a7b36..d7eb66bee 100644
--- a/build/visual-studio/miniz/miniz.vcxproj
+++ b/build/visual-studio/miniz/miniz.vcxproj
@@ -189,15 +189,11 @@
       <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>

@@ -246,16 +242,12 @@
       <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>

     <ClCompile Include="..\..\..\external\miniz\miniz.c" />

diff --git a/build/visual-studio/model-viewer/model-viewer.vcxproj b/build/visual-studio/model-viewer/model-viewer.vcxproj
index 4d9e06681..4d8a5d7b7 100644
--- a/build/visual-studio/model-viewer/model-viewer.vcxproj
+++ b/build/visual-studio/model-viewer/model-viewer.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <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>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/platform/platform.vcxproj b/build/visual-studio/platform/platform.vcxproj
index aab1619fe..9554dabca 100644
--- a/build/visual-studio/platform/platform.vcxproj
+++ b/build/visual-studio/platform/platform.vcxproj
@@ -201,13 +201,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\platform.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -262,14 +260,12 @@
       <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>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\platform.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj
index b626fe04b..5bed15142 100644
--- a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj
+++ b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <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>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/ray-tracing/ray-tracing.vcxproj b/build/visual-studio/ray-tracing/ray-tracing.vcxproj
index 0cfbccdd5..f3c174a34 100644
--- a/build/visual-studio/ray-tracing/ray-tracing.vcxproj
+++ b/build/visual-studio/ray-tracing/ray-tracing.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <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>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj b/build/visual-studio/render-test-tool/render-test-tool.vcxproj
index 6b5d29e30..0a5c16efb 100644
--- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj
+++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj
@@ -207,13 +207,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\render-test-tool.lib</ImportLibrary>

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

     </Link>

     <PostBuildEvent>

       <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/aarch64/" "../../../bin/windows-aarch64/debug/" "windows-aarch64"</Command>

@@ -277,14 +275,12 @@
       <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>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\render-test-tool.lib</ImportLibrary>

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

     </Link>

     <PostBuildEvent>

       <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/aarch64/" "../../../bin/windows-aarch64/release/" "windows-aarch64"</Command>

diff --git a/build/visual-studio/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj
index 7cb84044e..39ea11974 100644
--- a/build/visual-studio/run-generators/run-generators.vcxproj
+++ b/build/visual-studio/run-generators/run-generators.vcxproj
@@ -189,15 +189,11 @@
       <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>

@@ -246,16 +242,12 @@
       <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="..\..\..\prelude\slang-cpp-scalar-intrinsics.h" />

diff --git a/build/visual-studio/shader-object/shader-object.vcxproj b/build/visual-studio/shader-object/shader-object.vcxproj
index c1376082b..710aa8421 100644
--- a/build/visual-studio/shader-object/shader-object.vcxproj
+++ b/build/visual-studio/shader-object/shader-object.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/shader-toy/shader-toy.vcxproj b/build/visual-studio/shader-toy/shader-toy.vcxproj
index ed775c396..a1f54519f 100644
--- a/build/visual-studio/shader-toy/shader-toy.vcxproj
+++ b/build/visual-studio/shader-toy/shader-toy.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <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>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
index d91e2c27f..93383cda9 100644
--- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
+++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang-embed/slang-embed.vcxproj b/build/visual-studio/slang-embed/slang-embed.vcxproj
index d8b432540..c7667317c 100644
--- a/build/visual-studio/slang-embed/slang-embed.vcxproj
+++ b/build/visual-studio/slang-embed/slang-embed.vcxproj
@@ -195,12 +195,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -250,13 +248,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang-generate/slang-generate.vcxproj b/build/visual-studio/slang-generate/slang-generate.vcxproj
index 35ce0db79..8490d0499 100644
--- a/build/visual-studio/slang-generate/slang-generate.vcxproj
+++ b/build/visual-studio/slang-generate/slang-generate.vcxproj
@@ -195,12 +195,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -250,13 +248,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj
index f1b20c46e..f2d29d02e 100644
--- a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj
+++ b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj
@@ -200,13 +200,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\slang-reflection-test-tool.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -261,14 +259,12 @@
       <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>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\slang-reflection-test-tool.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj
index 1ab77c6c0..6b8ef78df 100644
--- a/build/visual-studio/slang-rt/slang-rt.vcxproj
+++ b/build/visual-studio/slang-rt/slang-rt.vcxproj
@@ -197,13 +197,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\slang-rt.lib</ImportLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -255,14 +253,12 @@
       <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>
       <ImportLibrary>..\..\..\bin\windows-aarch64\release\slang-rt.lib</ImportLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/visual-studio/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj
index 2cefd6f51..c1e49ce22 100644
--- a/build/visual-studio/slang-test/slang-test.vcxproj
+++ b/build/visual-studio/slang-test/slang-test.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj
index ae54257a2..1c5473dd8 100644
--- a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj
+++ b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj
@@ -200,13 +200,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\slang-unit-test-tool.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -261,14 +259,12 @@
       <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>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\slang-unit-test-tool.lib</ImportLibrary>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index 060ea3d0f..9e343f197 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -208,13 +208,11 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.d
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>..\..\..\bin\windows-aarch64\debug\slang.lib</ImportLibrary>

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

     </Link>

     <PostBuildEvent>

       <Command>IF EXIST ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\debug &gt; nul)

@@ -281,14 +279,12 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.d
       <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>

       <ImportLibrary>..\..\..\bin\windows-aarch64\release\slang.lib</ImportLibrary>

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

     </Link>

     <PostBuildEvent>

       <Command>IF EXIST ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\release &gt; nul)

diff --git a/build/visual-studio/slangc/slangc.vcxproj b/build/visual-studio/slangc/slangc.vcxproj
index 4dfe368fe..951ccedf2 100644
--- a/build/visual-studio/slangc/slangc.vcxproj
+++ b/build/visual-studio/slangc/slangc.vcxproj
@@ -195,12 +195,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -250,13 +248,11 @@
       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/build/visual-studio/slangd/slangd.vcxproj b/build/visual-studio/slangd/slangd.vcxproj
index c1b0584c3..578c755aa 100644
--- a/build/visual-studio/slangd/slangd.vcxproj
+++ b/build/visual-studio/slangd/slangd.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/visual-studio/test-process/test-process.vcxproj b/build/visual-studio/test-process/test-process.vcxproj
index c0605aadc..f2ed6c665 100644
--- a/build/visual-studio/test-process/test-process.vcxproj
+++ b/build/visual-studio/test-process/test-process.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/visual-studio/test-server/test-server.vcxproj b/build/visual-studio/test-server/test-server.vcxproj
index 9faa9b9a4..e10b75308 100644
--- a/build/visual-studio/test-server/test-server.vcxproj
+++ b/build/visual-studio/test-server/test-server.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -256,13 +254,11 @@
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>-arch arm64 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/visual-studio/triangle/triangle.vcxproj b/build/visual-studio/triangle/triangle.vcxproj
index 0a40e03c1..cc4fa6774 100644
--- a/build/visual-studio/triangle/triangle.vcxproj
+++ b/build/visual-studio/triangle/triangle.vcxproj
@@ -198,12 +198,10 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -256,13 +254,11 @@
       <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>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/premake5.lua b/premake5.lua
index 264aebc04..164dfe51b 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -319,6 +319,7 @@ newoption {
          architecture "x86"
      filter { "platforms:aarch64" }
          architecture "ARM64"
+     filter { "platforms:aarch64", "toolset:clang" }
          buildoptions { "-arch arm64" }
 		 linkoptions { "-arch arm64" }