aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-03-25 09:08:20 +1100
committerNeil <nyamatongwe@gmail.com>2020-03-25 09:08:20 +1100
commitac7f6b426ce63c55e37e28866e81c19b7df104f8 (patch)
tree9d875975bd1f168378ce34814ce8a8f43b167166
parent9df31197549b77d8a56587775d3b77e3c0b314e4 (diff)
downloadscintilla-mirror-ac7f6b426ce63c55e37e28866e81c19b7df104f8.tar.gz
Fix link warning by using incorrect subsystem value for 64-bit Windows XP.
Relies on Platform environment variable and defaults to 32-bit.
-rw-r--r--win32/scintilla.mak6
1 files changed, 6 insertions, 0 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 4a652f426..6862bc561 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