From 92392c76c92378afdf263d236e939f49ce321ee1 Mon Sep 17 00:00:00 2001
From: prashantchahar <chahar.prashant@gmail.com>
Date: Mon, 19 Feb 2024 10:13:13 -0800
Subject: Add explicit flag for arm64 for ehsc and remove incremental link
 (#1117)

* Add explicit flag for arm64 for ehsc and remove incremental link as ehsc is not passsed for ARM64 VS and looks like ltcg is not supported as well.

* Update exclusions.csv

* Set exception handling via property ExceptionHandling

---------

Co-authored-by: Prashant Chahar <pchahar@microsoft.com>
Co-authored-by: JakobL-MSFT <110699333+JakobL-MSFT@users.noreply.github.com>
Co-authored-by: Jakob Lichtenberg (170957) <jakobl@microsoft.com>
---
 exclusions.csv                                     |  1 -
 .../IddSampleApp/IddSampleApp.vcxproj              | 29 +++-------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/exclusions.csv b/exclusions.csv
index 1a5ed717..e571e8e0 100644
--- a/exclusions.csv
+++ b/exclusions.csv
@@ -3,5 +3,4 @@ audio\acx\samples\audiocodec\driver,*,,22621,Only NI: error C1083: Cannot open i
 general\dchu\osrfx2_dchu_extension_loose,*|x64,,22621,Only NI: Only x64: Fails to build
 general\dchu\osrfx2_dchu_extension_tight,*|x64,,22621,Only NI: Only x64: Fails to build
 prm,*,,22621,Only NI: Not supported on NI.
-video\indirectdisplay,*,,,Only EWDK: Fails to build with EWDK (builds fine with regular WDK).
 tree,*,,,Missing headers
diff --git a/video/IndirectDisplay/IddSampleApp/IddSampleApp.vcxproj b/video/IndirectDisplay/IddSampleApp/IddSampleApp.vcxproj
index 90afb399..3ee99ac8 100644
--- a/video/IndirectDisplay/IddSampleApp/IddSampleApp.vcxproj
+++ b/video/IndirectDisplay/IddSampleApp/IddSampleApp.vcxproj
@@ -38,7 +38,6 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{ED59DFCA-E75B-4DD8-B5C2-6BFF77A225A6}</ProjectGuid>
     <RootNamespace>IddSampleApp</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -123,30 +122,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -166,6 +141,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <ExceptionHandling>Sync</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -223,7 +199,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <AdditionalOptions>/EHsc</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-- 
cgit v1.3.1