From 31817524c949b176a9fc5ac34b7dfd9d824c00e8 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 25 Mar 2020 09:08:20 +1100
Subject: Backport: Fix link warning by using incorrect subsystem value for
 64-bit Windows XP. Relies on Platform environment variable and defaults to
 32-bit.

Backport of changeset 8025:5a6e242072ae.
---
 win32/scintilla.mak | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'win32')

diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index d5c3a2a9e..f9b0a4bdf 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -21,7 +21,13 @@ LD=link
 
 !IFDEF SUPPORT_XP
 ADD_DEFINE=-D_USING_V110_SDK71_
+# Different subsystems for 32-bit and 64-bit Windows XP so detect based on Platform
+# environment vairable set by vcvars*.bat to be either x86 or x64
+!IF "$(PLATFORM)" == "x64"
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.02
+!ELSE
 SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01
+!ENDIF
 !ELSEIFDEF ARM64
 ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
 SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
-- 
cgit v1.2.3