diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-31 20:19:24 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-31 20:19:24 +1100 |
| commit | 8c9b09dd5f861e52590a154b2ad8ee0f0dc4e89f (patch) | |
| tree | dfaf6cc1b26e02b857c4ef971231f5957ed02f8c /win32/scintilla.mak | |
| parent | 45d4e27aed4e2301a2dd00d8ee59174ff2a2f0db (diff) | |
| download | scintilla-mirror-8c9b09dd5f861e52590a154b2ad8ee0f0dc4e89f.tar.gz | |
Backport: Implement SCI_SETILEXER.
Backport of changeset 7871:ff54e1fc74f3, but with the ability to distinguish
between ILexer and ILexer5 interfaces.
Diffstat (limited to 'win32/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index f9b0a4bdf..d446bb262 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -230,7 +230,7 @@ LEX_OBJS=\ # Required by lexers LEXLIB_OBJS = \ $(DIR_O)\Accessor.obj \ - $(DIR_O)\Catalogue.obj \ + $(DIR_O)\CatalogueL.obj \ $(DIR_O)\ExternalLexer.obj \ $(DIR_O)\DefaultLexer.obj \ $(DIR_O)\LexerBase.obj \ @@ -250,11 +250,17 @@ SCILEX_OBJS = \ $(DIR_O)\ScintillaWin.obj COMPONENT_OBJS = \ + $(DIR_O)\Accessor.obj \ + $(DIR_O)\Catalogue.obj \ $(DIR_O)\HanjaDic.obj \ + $(DIR_O)\LexerBase.obj \ + $(DIR_O)\LexerModule.obj \ + $(DIR_O)\LexerSimple.obj \ $(DIR_O)\PlatWin.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaDLL.obj \ $(DIR_O)\ScintillaWin.obj \ + $(DIR_O)\WordList.obj \ $(SRC_OBJS) LEXCOMPONENT_OBJS = \ @@ -288,6 +294,12 @@ $(LIBSCI): $(SCILEX_OBJS) $(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx +$(DIR_O)\CatalogueL.obj: ..\src\Catalogue.cxx + $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\Catalogue.cxx + +$(DIR_O)\Catalogue.obj: ..\src\Catalogue.cxx + $(CXX) $(CXXFLAGS) -DSCI_LEXER -DSCI_EMPTYCATALOGUE -c $(NAME)$@ ..\src\Catalogue.cxx + # Dependencies !IF EXISTS(nmdeps.mak) |