aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-12-14 08:09:58 +1100
committerNeil <nyamatongwe@gmail.com>2019-12-14 08:09:58 +1100
commitb9b5cf4cb81c03c1871a40becbe9b4d7807ad600 (patch)
tree6e0ccf8880133db9a9fff7bada5c9df5637ee263 /src
parentb6d260731bddb23d63f4a0990305b1d9501f7cf8 (diff)
downloadscintilla-mirror-b9b5cf4cb81c03c1871a40becbe9b4d7807ad600.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/Catalogue.cxx4
1 files changed, 4 insertions, 0 deletions
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;
}