From 8c9b09dd5f861e52590a154b2ad8ee0f0dc4e89f Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 31 Dec 2019 20:19:24 +1100
Subject: Backport: Implement SCI_SETILEXER.

Backport of changeset 7871:ff54e1fc74f3, but with the ability to distinguish
between ILexer and ILexer5 interfaces.
---
 win32/makefile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'win32/makefile')

diff --git a/win32/makefile b/win32/makefile
index 1b5ce451b..0bb3d0d8f 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -117,6 +117,7 @@ SRC_OBJS = \
 	MarginView.o \
 	PerLine.o \
 	PositionCache.o \
+	PropSetSimple.o \
 	RESearch.o \
 	RunStyles.o \
 	Selection.o \
@@ -129,13 +130,12 @@ SRC_OBJS = \
 # Required by lexers
 LEXLIB_OBJS = \
 	Accessor.o \
-	Catalogue.o \
+	CatalogueL.o \
 	DefaultLexer.o \
 	ExternalLexer.o \
 	LexerBase.o \
 	LexerModule.o \
 	LexerSimple.o \
-	PropSetSimple.o \
 	StyleContext.o \
 	WordList.o
 
@@ -152,12 +152,18 @@ SCILEX_OBJS=\
 
 COMPONENT_OBJS = \
 	$(SRC_OBJS) \
+	Accessor.o \
+	Catalogue.o \
 	HanjaDic.o \
+	LexerBase.o \
+	LexerModule.o \
+	LexerSimple.o \
 	PlatWin.o \
 	ScintillaBase.o \
 	ScintillaDLL.o \
 	ScintillaWin.o \
-	ScintRes.o
+	ScintRes.o \
+	WordList.o
 
 LEXCOMPONENT_OBJS = \
 	$(SCILEX_OBJS) \
@@ -180,6 +186,12 @@ include deps.mak
 ScintillaBaseL.o:
 	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
 
+Catalogue.o: Catalogue.cxx
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
+
+CatalogueL.o: Catalogue.cxx
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
+
 ScintRes.o:	ScintRes.rc
 	$(WINDRES) ScintRes.rc $@
 
-- 
cgit v1.2.3