diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-01-28 08:32:17 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-01-28 08:32:17 +1100 |
| commit | cc7726eda8aadd6421e4b867b013518aee465ae9 (patch) | |
| tree | 00477b87583b25e113d0bac910dcb2cfd089349a | |
| parent | 5baf92142d47f7d653395c60d758be48775ef313 (diff) | |
| download | scintilla-mirror-cc7726eda8aadd6421e4b867b013518aee465ae9.tar.gz | |
Allow C++17 in all build and project files.
| -rw-r--r-- | gtk/makefile | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditPy/ScintillaEditPy.pro | 4 | ||||
| -rw-r--r-- | win32/SciLexer.vcxproj | 6 |
5 files changed, 10 insertions, 6 deletions
diff --git a/gtk/makefile b/gtk/makefile index 70d5aac9c..37ed063c5 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -81,7 +81,7 @@ else CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -CXXTFLAGS:=--std=gnu++14 $(CTFLAGS) $(REFLAGS) +CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 7fec6e353..3bfffe330 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = ScintillaEdit TEMPLATE = lib CONFIG += lib_bundle -CONFIG += c++14 +CONFIG += c++1z VERSION = 4.0.2 diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 987783dc1..792fced9b 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = ScintillaEditBase TEMPLATE = lib CONFIG += lib_bundle -CONFIG += c++14 +CONFIG += c++1z VERSION = 4.0.2 diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro index d5367d379..dce11ccac 100644 --- a/qt/ScintillaEditPy/ScintillaEditPy.pro +++ b/qt/ScintillaEditPy/ScintillaEditPy.pro @@ -6,7 +6,7 @@ TARGET = ScintillaEditPy # Clear debug & release so that sepbuild.pri can set one or the other CONFIG -= debug release -CONFIG += c++14 +CONFIG += c++1z include(sepbuild.pri) @@ -40,7 +40,7 @@ unix:linux-* { # gcc on freebsd 9.2, at least, doesn't support -Wno-empty-body # g++ 7.x has deprecated std::auto_ptr but that is used by code generated by Shiboken so # turn off warning. - QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-empty-body -Wno-deprecated-declarations + QMAKE_CXXFLAGS += -Wno-register -Wno-unused-parameter -Wno-empty-body -Wno-deprecated-declarations --std=gnu++17 LIBS += -ldl } diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj index 3466cd032..184ef86e8 100644 --- a/win32/SciLexer.vcxproj +++ b/win32/SciLexer.vcxproj @@ -27,7 +27,7 @@ <PropertyGroup>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
@@ -72,6 +72,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -80,6 +81,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -90,6 +92,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -101,6 +104,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|