diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-04-28 08:46:10 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-04-28 08:46:10 +1000 |
| commit | aa0f59453eb4ecbadbcf5959ce14a3f0371d396d (patch) | |
| tree | 221a1374609f20ad122710a6bd5daf456a3834dd /win32 | |
| parent | c70faaf270c47555d965d9a6949fdb2e06b5dfdb (diff) | |
| download | scintilla-mirror-aa0f59453eb4ecbadbcf5959ce14a3f0371d396d.tar.gz | |
Switch from /std:c++latest to /std:c++17 as Visual C++ 2019 now includes some
C++20 features.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/SciLexer.vcxproj | 8 | ||||
| -rw-r--r-- | win32/scintilla.mak | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj index 91c85139b..300cd2044 100644 --- a/win32/SciLexer.vcxproj +++ b/win32/SciLexer.vcxproj @@ -72,7 +72,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -81,7 +81,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -92,7 +92,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -104,7 +104,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 217ba1131..8c72176c6 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -25,7 +25,7 @@ XP_LINK=-SUBSYSTEM:WINDOWS,5.01 !ENDIF CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(XP_DEFINE) -CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++latest $(CRTFLAGS) +CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS) CXXDEBUG=-Od -MTd -DDEBUG CXXNDEBUG=-O1 -MT -DNDEBUG -GL NAME=-Fo |