From f84f2a3daef704cb309009f51b5da9f325979f68 Mon Sep 17 00:00:00 2001 From: mitchell Date: Mon, 27 May 2019 18:34:00 -0400 Subject: Backport: Feature [feature-requests:#1280]. Lexer added for X12. Backport of changeset 7486:a99fa007805f, but with LexerX12::Terminator struct definition not having default values, which is a C++14 feature. --- win32/deps.mak | 8 ++++++++ win32/nmdeps.mak | 8 ++++++++ win32/scintilla.mak | 1 + 3 files changed, 17 insertions(+) (limited to 'win32') diff --git a/win32/deps.mak b/win32/deps.mak index 4bc99e211..8c53840ad 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1963,6 +1963,14 @@ LexVisualProlog.o: \ ../lexlib/LexerModule.h \ ../lexlib/OptionSet.h \ ../lexlib/DefaultLexer.h +LexX12.o: \ + ../lexers/LexX12.cxx \ + ../include/ILexer.h \ + ../include/Sci_Position.h \ + ../include/Scintilla.h \ + ../include/SciLexer.h \ + ../lexlib/LexerModule.h \ + ../lexlib/DefaultLexer.h LexYAML.o: \ ../lexers/LexYAML.cxx \ ../include/ILexer.h \ diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak index 9cf46b03b..8ddedfc79 100644 --- a/win32/nmdeps.mak +++ b/win32/nmdeps.mak @@ -1963,6 +1963,14 @@ $(DIR_O)/LexVisualProlog.obj: \ ../lexlib/LexerModule.h \ ../lexlib/OptionSet.h \ ../lexlib/DefaultLexer.h +$(DIR_O)/LexX12.obj: \ + ../lexers/LexX12.cxx \ + ../include/ILexer.h \ + ../include/Sci_Position.h \ + ../include/Scintilla.h \ + ../include/SciLexer.h \ + ../lexlib/LexerModule.h \ + ../lexlib/DefaultLexer.h $(DIR_O)/LexYAML.obj: \ ../lexers/LexYAML.cxx \ ../include/ILexer.h \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 31b362225..49ae58a25 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -217,6 +217,7 @@ LEXOBJS=\ $(DIR_O)\LexVerilog.obj \ $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexVisualProlog.obj \ + $(DIR_O)\LexX12.obj \ $(DIR_O)\LexYAML.obj \ #--Autogenerated -- end of automatically generated section -- cgit v1.2.3