diff options
Diffstat (limited to 'gtk/makefile')
| -rw-r--r-- | gtk/makefile | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/gtk/makefile b/gtk/makefile index a28aa092d..8854a823a 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -79,14 +79,28 @@ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS) +ifdef LPEG_LEXER +CXXTFLAGS+=-DLPEG_LEXER -I ../src/lua +LUA_CFLAGS:=-std=c99 -pedantic -Wall -I ../src/lua -DLUA_USE_POSIX -DLUA_USE_DLOPEN +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 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o +all: $(COMPLIB) + .cxx.o: $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< -.c.o: +$(MARSHALLER): scintilla-marshal.c $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $< +$(LUAOBJS): %.o: ../lua/src/%.c + $(CC) $(LUA_CFLAGS) $(CFLAGS) -c $< GLIB_GENMARSHAL = glib-genmarshal GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal @@ -98,8 +112,6 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))) -all: $(COMPLIB) - clean: $(DEL) *.o $(COMPLIB) *.plist @@ -119,7 +131,7 @@ $(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o St PropSetSimple.o PlatGTK.o \ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ - $(MARSHALLER) $(LEXOBJS) + $(MARSHALLER) $(LEXOBJS) $(LUAOBJS) $(AR) $(ARFLAGS) $@ $^ $(RANLIB) $@ |