From 38a0041bd5e46a53ec4d7356e2cc624aee071518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Tue, 20 Oct 2015 10:47:57 +0200 Subject: vis: try to support all lua versions >= 5.1 Make lpeg module table explicitly global, which should work with the different module loading semantics. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d953f61..b7f49be 100644 --- a/Makefile +++ b/Makefile @@ -163,12 +163,12 @@ dependency/sources/extract-liblua: dependency/sources/$(LIBLUA).tar.gz touch $@ dependency/sources/patch-liblua: dependency/sources/extract-liblua - cd $(dir $<) && ([ -e lua-5.1.4-lpeg.patch ] || wget http://www.brain-dump.org/projects/vis/lua-5.1.4-lpeg.patch) - cd $(dir $<)/$(LIBLUA) && patch -p1 < ../lua-5.1.4-lpeg.patch + cd $(dir $<) && ([ -e $(LIBLUA)-lpeg.patch ] || wget http://www.brain-dump.org/projects/vis/$(LIBLUA)-lpeg.patch) + cd $(dir $<)/$(LIBLUA) && patch -p1 < ../$(LIBLUA)-lpeg.patch touch $@ dependency/sources/build-liblua: dependency/sources/patch-liblua dependency/sources/install-liblpeg - make -C $(dir $<)/$(LIBLUA)/src all CC=$(CC) MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -fPIC" MYLIBS="-Wl,-E -ldl -lncursesw -lm" + make -C $(dir $<)/$(LIBLUA)/src all CC=$(CC) MYCFLAGS="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL -DLUA_USE_POSIX -DLUA_USE_DLOPEN -fPIC" MYLIBS="-Wl,-E -ldl -lncursesw -lm" #make -C $(dir $<)/$(LIBLUA) posix CC=$(CC) touch $@ @@ -198,7 +198,7 @@ dependencies: dependency/sources/install-libtermkey dependency/sources/install-l dependencies-full: dependency/sources/install-libncurses dependencies local: dependencies - CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" make + CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" make CFLAGS_LUA= CFLAGS_TERMKEY= LDFLAGS_LUA=-llua LDFLAGS_TERMKEY=-ltermkey @echo Run with: LD_LIBRARY_PATH=$(DEPS_LIB) ./vis standalone: dependency/sources/install-libmusl -- cgit v1.2.3