Implement SCI_SETILEXER.

5 files changed, 50 insertions, 5 deletions

diff --git a/win32/DepGen.py b/win32/DepGen.py
index c255574b0..6196720e2 100644
--- a/win32/DepGen.py
+++ b/win32/DepGen.py
@@ -22,6 +22,9 @@ def Generate():
 	# Add ScintillaBaseL as the same as ScintillaBase
 	deps = Dependencies.InsertSynonym(deps, "ScintillaBase.o", "ScintillaBaseL.o")
 
+	# Add CatalogueL as the same as Catalogue
+	deps = Dependencies.InsertSynonym(deps, "Catalogue.o", "CatalogueL.o")
+
 	Dependencies.UpdateDependencies("../win32/deps.mak", deps, topComment)
 
 	# Create the dependencies file for MSVC
diff --git a/win32/deps.mak b/win32/deps.mak
index 4eed6cc45..ef38f88e2 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -88,6 +88,15 @@ Catalogue.o: \
 	../lexlib/LexerModule.h \
 	../lexlib/CatalogueModules.h \
 	../src/Catalogue.h
+CatalogueL.o: \
+	../src/Catalogue.cxx \
+	../include/ILexer.h \
+	../include/Sci_Position.h \
+	../include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/LexerModule.h \
+	../lexlib/CatalogueModules.h \
+	../src/Catalogue.h
 CellBuffer.o: \
 	../src/CellBuffer.cxx \
 	../include/Platform.h \
diff --git a/win32/makefile b/win32/makefile
index 30ae527fb..45c9c525b 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -100,6 +100,7 @@ SRC_OBJS = \
 	MarginView.o \
 	PerLine.o \
 	PositionCache.o \
+	PropSetSimple.o \
 	RESearch.o \
 	RunStyles.o \
 	Selection.o \
@@ -112,13 +113,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
 
@@ -134,12 +134,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) \
@@ -162,6 +168,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 $@
 
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak
index c4fab693f..753bc6463 100644
--- a/win32/nmdeps.mak
+++ b/win32/nmdeps.mak
@@ -88,6 +88,15 @@ $(DIR_O)/Catalogue.obj: \
 	../lexlib/LexerModule.h \
 	../lexlib/CatalogueModules.h \
 	../src/Catalogue.h
+$(DIR_O)/CatalogueL.obj: \
+	../src/Catalogue.cxx \
+	../include/ILexer.h \
+	../include/Sci_Position.h \
+	../include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/LexerModule.h \
+	../lexlib/CatalogueModules.h \
+	../src/Catalogue.h
 $(DIR_O)/CellBuffer.obj: \
 	../src/CellBuffer.cxx \
 	../include/Platform.h \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 0e0f7558c..e005e298b 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -221,14 +221,14 @@ 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 \
 	$(DIR_O)\LexerModule.obj \
 	$(DIR_O)\LexerSimple.obj \
 	$(DIR_O)\StyleContext.obj \
-	$(DIR_O)\WordList.obj \
+	$(DIR_O)\WordList.obj
 
 # Required by libraries and DLLs that include lexing
 SCILEX_OBJS = \
@@ -241,11 +241,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 = \
@@ -279,6 +285,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)