From 5c766c5056c2531f82ef529cd92fcd160e371dfe Mon Sep 17 00:00:00 2001
From: Ahmet Sait <git@ahmetsait.com>
Date: Tue, 25 Mar 2025 08:16:17 +1100
Subject: Feature [feature-requests:#1546]. Fix building for ARM64 on Win32.

---
 doc/ScintillaHistory.html | 6 ++++++
 win32/scintilla.mak       | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 573242ef4..98346def6 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -588,6 +588,8 @@
 	<td>Joachim Mairboeck</td>
 	<td>Gianluca Vaccari</td>
 	<td>8day</td>
+      </tr><tr>
+	<td>Ahmet Sait</td>
     </tr>
     </table>
     <h2 id="Releases">Releases</h2>
@@ -606,6 +608,10 @@
 	On Win32, use DirectWrite for autocompletion lists when DirectWrite chosen for document text.
 	</li>
 	<li>
+	When using Visual C++ through nmake, fix building for ARM64.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1546/">Feature #1546</a>.
+	</li>
+	<li>
 	On Qt, draw clipped UTF-8 text correctly.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2464/">Bug #2464</a>.
 	</li>
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index f2cf5c93d..95c2fe906 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -18,6 +18,10 @@ LIBSCI=$(DIR_BIN)\libscintilla.lib
 
 LD=link
 
+!IF "$(PLATFORM:64=)" == "arm"
+ARM64=1
+!ENDIF
+
 !IFDEF SUPPORT_XP
 ADD_DEFINE=-D_USING_V110_SDK71_
 # Different subsystems for 32-bit and 64-bit Windows XP so detect based on Platform
@@ -28,10 +32,11 @@ SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.02
 SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01
 !ENDIF
 !ELSE
-CETCOMPAT=-CETCOMPAT
 !IFDEF ARM64
 ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
 SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
+!ELSE
+CETCOMPAT=-CETCOMPAT
 !ENDIF
 !ENDIF
 
-- 
cgit v1.2.3