X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=8cff9078da6aa900dd95163eee169ce308f4ac3c;hb=refs%2Fheads%2Flua;hp=f2a7361ea73f1349aa371e7adb4026535675b06e;hpb=bc432588d79bf0c0ba61430e0b6fc4c8e754eef6;p=leo.git

diff --git a/Makefile b/Makefile
index f2a7361..8cff907 100644
--- a/Makefile
+++ b/Makefile
@@ -14,13 +14,13 @@ BUILDSYS=$(s)/build
 include $(BUILDSYS)/Maketop
 
 PROGS+=$(o)/leo
-CFLAGS+=$(LIBUCW_CFLAGS)
+CFLAGS+=$(LIBUCW_CFLAGS) $(LUA_CFLAGS)
 
-LEO_MODULES=leo xml osm svg svg-icon css-parse css-lex style css dict sym sym-point sym-line sym-text map shp
+LEO_MODULES=leo xml osm svg svg-icon css-parse css-lex style css dict sym sym-point sym-line sym-scale sym-text map shp fixed leo_wrap
 LEO_OBJECTS=$(addprefix $(o)/, $(addsuffix .o, $(LEO_MODULES)))
 $(o)/leo: $(LEO_OBJECTS)
 
-$(o)/leo: LIBS+=$(LIBUCW_LIBS) $(LIBUCW_CHARSET_LIBS) $(LIBUCW_XML_LIBS) $(PANGOFT2_LIBS) $(FREETYPE_LIBS) -lproj
+$(o)/leo: LIBS+=$(LIBUCW_LIBS) $(LIBUCW_CHARSET_LIBS) $(LIBUCW_XML_LIBS) $(PANGOFT2_LIBS) $(FREETYPE_LIBS) $(LUA_LIBS) -lproj -lm
 
 $(o)/sym-text.o: CFLAGS+=$(FREETYPE_CFLAGS) $(PANGOFT2_CFLAGS)
 $(o)/svg-icon.o: CFLAGS+=$(LIBUCW_XML_CFLAGS)
@@ -34,6 +34,12 @@ $(o)/css-parse.c: css-parse.y
 $(o)/dict-%.h: dict-%.t $(BUILDSYS)/gen-dict
 	build/gen-dict <$< >$@
 
+$(o)/leo_wrap.o: $(o)/leo_wrap.c
+
+$(o)/leo_wrap.c: $(s)/expr.i
+	$(M)SWIG $<
+	$(Q)swig -I$(s) -lua -outdir $(o) -o $@ $<
+
 ifndef CONFIG_LOCAL
 install: all $(INSTALL_TARGETS)
 else
@@ -42,7 +48,7 @@ install:
 endif
 .PHONY: install
 
-output.svg: $(o)/leo dump.osm poskole.css
+output.svg: $(o)/leo dump.osm map.cf poskole.css
 	$(o)/leo
 
 output.pdf: output.svg