From a8cab2327983ce120276c7cc99185c70b48189e9 Mon Sep 17 00:00:00 2001
From: Mat Berchtold <unknown>
Date: Fri, 22 Apr 2022 15:53:30 +1000
Subject: Bug [#2324] Fix ARM64 builds with Visual C++ due to unsupported
 CETCOMPAT flag.

---
 doc/ScintillaHistory.html | 4 ++++
 win32/Scintilla.vcxproj   | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 26ac34f5f..499d3558c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -590,6 +590,10 @@
 	Fix problem with horizontally inverted glyphs with buffered drawing and WS_EX_LAYOUTRTL set on Win32 GDI.
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1435/">Feature #1435</a>.
 	</li>
+	<li>
+	Fix ARM64 builds with Visual C++ due to unsupported CETCOMPAT flag.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2324/">Bug #2324</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla522.zip">Release 5.2.2</a>
diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
index e6bc39949..1ceffb325 100644
--- a/win32/Scintilla.vcxproj
+++ b/win32/Scintilla.vcxproj
@@ -95,7 +95,6 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -105,6 +104,7 @@
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,6 +114,7 @@
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -135,6 +136,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -147,6 +149,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-- 
cgit v1.2.3