From 1d50bd19d2ec517b8ee62bbd4ccd946df631f7a2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 14 Feb 2021 15:07:46 +0100 Subject: [PATCH] consider newer lua versions --- .travis.yml | 1 + s/cmake-init | 4 ++++ tolua | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8737c3e58..8d8ac72db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ sudo: false language: c +dist: bionic compiler: - gcc - clang diff --git a/s/cmake-init b/s/cmake-init index 91600cc13..d119b148e 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -82,6 +82,10 @@ LUA_INCLUDE=/usr/include LUA_DIR=/usr if [ -d /usr/local/include/lua ]; then LUA_INCLUDE=/usr/local/include/lua +elif [ -d /usr/include/lua5.4 ]; then + LUA_INCLUDE=/usr/include/lua5.4 +elif [ -d /usr/include/lua5.3 ]; then + LUA_INCLUDE=/usr/include/lua5.3 elif [ -d /usr/include/lua5.2 ]; then LUA_INCLUDE=/usr/include/lua5.2 elif [ -d /usr/include/lua5.1 ]; then diff --git a/tolua b/tolua index e054dd7b9..8a658c005 160000 --- a/tolua +++ b/tolua @@ -1 +1 @@ -Subproject commit e054dd7b9280300828343e7007d083ab30b6531e +Subproject commit 8a658c00574f2e4889f2631be167b597b6f087e7