diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-07-03 08:28:56 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-07-03 08:28:56 +1000 |
| commit | c15fc57b0be7d5a81b8e67a943a4db8e80898e06 (patch) | |
| tree | 7dbd9b5f52e6b8fcdd1addc6767eba069388734b /win32/makefile | |
| parent | 7b646db9fbfb71c41c477b01d99e1e1c6c85cef8 (diff) | |
| download | scintilla-mirror-c15fc57b0be7d5a81b8e67a943a4db8e80898e06.tar.gz | |
Remove remnants of support for including lexers in Scintilla.
Diffstat (limited to 'win32/makefile')
| -rw-r--r-- | win32/makefile | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/win32/makefile b/win32/makefile index 9a49602ef..c09d8d74a 100644 --- a/win32/makefile +++ b/win32/makefile @@ -41,13 +41,13 @@ else DEL = rm -f endif -vpath %.h ../src ../include ../lexlib -vpath %.cxx ../src ../lexlib ../lexers +vpath %.h ../src ../include +vpath %.cxx ../src LDFLAGS=-shared -static -mwindows LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW) -INCLUDES=-I ../include -I ../src -I../lexlib +INCLUDES=-I ../include -I ../src BASE_FLAGS += $(WARNINGS) @@ -112,14 +112,6 @@ SRC_OBJS = \ ViewStyle.o \ XPM.o -# Required by libraries and DLLs that include lexing -SCILEX_OBJS=\ - $(SRC_OBJS) \ - HanjaDic.o \ - PlatWin.o \ - ScintillaBaseL.o \ - ScintillaWin.o - COMPONENT_OBJS = \ $(SRC_OBJS) \ HanjaDic.o \ @@ -139,15 +131,6 @@ $(LIBSCI): $(COMPONENT_OBJS) # Automatically generate dependencies for most files with "make deps" 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 $@ |