diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2008-11-22 15:48:29 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2008-11-22 15:48:29 -0500 |
| commit | 5ebcbca3f1094d1d2540215b2367eaf6c29dcb6d (patch) | |
| tree | 9699e6d3a3e10e165b04d33095fdd557cb3b94ad /src | |
| parent | 03cb710af3c9c6c75656e34cea1df16b65b80acf (diff) | |
| download | textadept-5ebcbca3f1094d1d2540215b2367eaf6c29dcb6d.tar.gz textadept-5ebcbca3f1094d1d2540215b2367eaf6c29dcb6d.zip | |
Compile lpeg into Lua so external lpeg.so, lpeg.dll isn't needed; src/Makefile
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index bb48c991..db299113 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ .SUFFIXES: .c .o .h .a -INCLUDEDIRS=-Iscintilla-st/include -Ilua +INCLUDEDIRS=-Iscintilla-st/include -Ilua/include ifdef DEBUG CXXFLAGS=-DDEBUG -g -DGTK -DSCI_LEXER -W -Wall else @@ -17,21 +17,25 @@ ARCHDIR=lib32 else ARCHDIR=x86_64 endif -LUA51A=../$(ARCHDIR)/src/liblua5.1.a GTKSO=../$(ARCHDIR)/core/gtk.so -LPEGSO=../$(ARCHDIR)/lexers/lpeg.so + +LUA_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.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 ldblib.o liolib.o lmathlib.o ltablib.o \ + lstrlib.o loadlib.o loslib.o linit.o \ + lpeg.o all: textadept .c.o: g++ $(GTKFLAGS) $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ -liblua5.1.a: - cp $(LUA51A) . +$(LUA_OBJS): lua/src/*.c + gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c lua/src/*.c textadept:\ - textadept.o lua_interface.o \ - scintilla-st/gtk/LexLPeg.o scintilla-st/bin/scintilla.a liblua5.1.a + textadept.o lua_interface.o $(LUA_OBJS) \ + scintilla-st/gtk/LexLPeg.o scintilla-st/bin/scintilla.a g++ $(GTKLIBS) $(EXPORTLUASYMS) -DGTK $^ -o $@ cp $(GTKSO) ../core/ - cp $(LPEGSO) ../lexers/ clean: rm textadept *.o |