diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-03-25 09:08:20 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-03-25 09:08:20 +1100 |
| commit | 31817524c949b176a9fc5ac34b7dfd9d824c00e8 (patch) | |
| tree | 014c85a5fe944dc9aa127b0fa240d00cf41ed5fe | |
| parent | 90451c3b3d26a0db92e07b8ab58ab55ba4968963 (diff) | |
| download | scintilla-mirror-31817524c949b176a9fc5ac34b7dfd9d824c00e8.tar.gz | |
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.
| -rw-r--r-- | win32/scintilla.mak | 6 |
1 files changed, 6 insertions, 0 deletions
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 |