diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 19 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 |
2 files changed, 20 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile index 1af28c03f..f3b75d796 100644 --- a/win32/makefile +++ b/win32/makefile @@ -31,6 +31,7 @@ LEXLIB = Lexers.a vpath %.h ../src ../include ../lexlib vpath %.cxx ../src ../lexlib ../lexers +vpath %.c ../lua/src LDFLAGS=-shared -static -mwindows $(LDMINGW) LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW) @@ -56,9 +57,22 @@ CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) STRIPFLAG=$(STRIPOPTION) endif +ifdef LPEG_LEXER +CXXFLAGS+=-DLPEG_LEXER -I ../lua/src +LUAOBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \ + llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \ + ltable.o ltm.o lundump.o lvm.o lzio.o \ + lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \ + lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o \ + lpcap.o lpcode.o lpprint.o lptree.o lpvm.o +endif + .cxx.o: $(CXX) $(CXXFLAGS) $(REFLAGS) -c $< +.c.o: + $(CC) $(CFLAGS) -c $< + ALL: $(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) ScintillaWinS.o clean: @@ -123,11 +137,12 @@ LOBJS = \ StyleContext.o \ WordList.o \ $(BASEOBJS) \ - $(LEXOBJS) + $(LEXOBJS) \ + $(LUAOBJS) $(LEXCOMPONENT): $(LOBJS) Scintilla.def $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LOBJS) $(CXXFLAGS) $(LIBS) -$(LEXLIB): $(LEXOBJS) +$(LEXLIB): $(LEXOBJS) $(LUAOBJS) $(AR) rc $@ $^ $(RANLIB) $@ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index c13eedc7d..aec630604 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -157,6 +157,7 @@ LEXOBJS=\ $(DIR_O)\LexLaTeX.obj \ $(DIR_O)\LexLisp.obj \ $(DIR_O)\LexLout.obj \ + $(DIR_O)\LexLPeg.obj \ $(DIR_O)\LexLua.obj \ $(DIR_O)\LexMagik.obj \ $(DIR_O)\LexMake.obj \ @@ -607,6 +608,8 @@ $(DIR_O)\LexLisp.obj: ..\lexers\LexLisp.cxx $(LEX_HEADERS) $(DIR_O)\LexLout.obj: ..\lexers\LexLout.cxx $(LEX_HEADERS) +$(DIR_O)\LexLPeg.obj: ..\lexers\LexLPeg.cxx $(LEX_HEADERS) + $(DIR_O)\LexLua.obj: ..\lexers\LexLua.cxx $(LEX_HEADERS) $(DIR_O)\LexMagik.obj: ..\lexers\LexMagik.cxx $(LEX_HEADERS) |