From ee0e98b74c7e7c64fb9079cd0bacd4c3e840c3b0 Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Fri, 19 Jun 2020 08:40:49 -0400
Subject: Reverted experimental Lexilla and SCI_SETILEXER support. When
 testing, it works when compiled with debug symbols enabled, but crashes
 without them. It doesn't seem worth maintaining.

---
 win32/makefile | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'win32/makefile')

diff --git a/win32/makefile b/win32/makefile
index 0bb3d0d8f..1b5ce451b 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -117,7 +117,6 @@ SRC_OBJS = \
 	MarginView.o \
 	PerLine.o \
 	PositionCache.o \
-	PropSetSimple.o \
 	RESearch.o \
 	RunStyles.o \
 	Selection.o \
@@ -130,12 +129,13 @@ SRC_OBJS = \
 # Required by lexers
 LEXLIB_OBJS = \
 	Accessor.o \
-	CatalogueL.o \
+	Catalogue.o \
 	DefaultLexer.o \
 	ExternalLexer.o \
 	LexerBase.o \
 	LexerModule.o \
 	LexerSimple.o \
+	PropSetSimple.o \
 	StyleContext.o \
 	WordList.o
 
@@ -152,18 +152,12 @@ 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 \
-	WordList.o
+	ScintRes.o
 
 LEXCOMPONENT_OBJS = \
 	$(SCILEX_OBJS) \
@@ -186,12 +180,6 @@ 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