diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/scintilla.mak | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 46dc0ba26..ac055a088 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -586,6 +586,10 @@ Update to Unicode 13. <a href="https://sourceforge.net/p/scintilla/feature-requests/1379/">Feature #1379</a>. </li> + <li> + On Win32 enable hardware-enforced stack protection. + <a href="https://sourceforge.net/p/scintilla/feature-requests/1405/">Feature #1405</a>. + </li> </ul> <h3> <a href="https://www.scintilla.org/scintilla502.zip">Release 5.0.2</a> diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 1858368da..cf272173b 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -27,17 +27,20 @@ SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.02 !ELSE SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01 !ENDIF -!ELSEIFDEF ARM64 +!ELSE +CETCOMPAT=-CETCOMPAT +!IFDEF ARM64 ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00 !ENDIF +!ENDIF CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(ADD_DEFINE) CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS) CXXDEBUG=-Od -MTd -DDEBUG CXXNDEBUG=-O1 -MT -DNDEBUG -GL NAME=-Fo -LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) +LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) $(CETCOMPAT) LDDEBUG= LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib MSIMG32.lib NOLOGO=-nologo |