diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2015-10-20 10:47:57 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2015-11-08 13:37:24 +0100 |
| commit | 38a0041bd5e46a53ec4d7356e2cc624aee071518 (patch) | |
| tree | 55a2194bc81433880f7fa59d58c49fd9f2201e08 /Makefile | |
| parent | cbc96c96d193829fc882c5b4d83c2006a232cfe6 (diff) | |
| download | vis-38a0041bd5e46a53ec4d7356e2cc624aee071518.tar.gz vis-38a0041bd5e46a53ec4d7356e2cc624aee071518.tar.xz | |
vis: try to support all lua versions >= 5.1
Make lpeg module table explicitly global, which should work
with the different module loading semantics.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |