From b9b5cf4cb81c03c1871a40becbe9b4d7807ad600 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 14 Dec 2019 08:09:58 +1100 Subject: Backport: Remove links to lexers with SCI_EMPTYCATALOGUE definition. This allows building a version of SciTE that is statically linked to Scintilla and does not include any lexers but allows the use of lexers provided by loading a DLL. Backport of changeset 7867:f17a228be4d8. --- src/Catalogue.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx index 919ecf668..9e0ab2921 100644 --- a/src/Catalogue.cxx +++ b/src/Catalogue.cxx @@ -53,6 +53,8 @@ int Scintilla_LinkLexers() { return 0; initialised = 1; +#if !defined(SCI_EMPTYCATALOGUE) + // Shorten the code that declares a lexer and ensures it is linked in by calling a method. #define LINK_LEXER(lexer) extern LexerModule lexer; catalogueDefault.AddLexerModule(&lexer); @@ -189,5 +191,7 @@ int Scintilla_LinkLexers() { //--Autogenerated -- end of automatically generated section +#endif + return 1; } -- cgit v1.2.3