diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-10-31 08:40:39 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-10-31 08:40:39 +1100 |
| commit | 7f896cd35013d0fd1c5cc07f6bf5f765d3a14d60 (patch) | |
| tree | 396da85f83a9af07199a961aeef2eee9ff5cdfb2 | |
| parent | e6645e87a119a0837dc0be8a6068fc2f5090da91 (diff) | |
| download | scintilla-mirror-7f896cd35013d0fd1c5cc07f6bf5f765d3a14d60.tar.gz | |
Backport: Feature [feature-requests:#1319] SUBSYSTEM is more explanatory than ADD_LINK.
Backport of changeset 7745:256c86252e83.
| -rw-r--r-- | win32/scintilla.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 30cbbdc43..eba27cae7 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -21,10 +21,10 @@ LD=link !IFDEF SUPPORT_XP ADD_DEFINE=-D_USING_V110_SDK71_ -ADD_LINK=-SUBSYSTEM:WINDOWS,5.01 +SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01 !ELSEIFDEF ARM64 ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 -ADD_LINK=-SUBSYSTEM:WINDOWS,10.00 +SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00 !ENDIF CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(ADD_DEFINE) @@ -32,7 +32,7 @@ CXXFLAGS=-Zi -TP -MP -W4 -EHsc $(CRTFLAGS) CXXDEBUG=-Od -MTd -DDEBUG CXXNDEBUG=-O1 -MT -DNDEBUG -GL NAME=-Fo -LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(ADD_LINK) +LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) LDDEBUG= LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib MSIMG32.lib NOLOGO=-nologo |