Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stop using the tolua-5.3 repository, the 5.2 works up to lua 5.4

This commit is contained in:
Enno Rehling 2021-02-12 21:10:41 +01:00 committed by Enno Rehling
parent b756fde006
commit 33332aedb4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
s/cmake-init
View File

@ -78,22 +78,21 @@ fi
DEST=$(dirname $ROOT)/server DEST=$(dirname $ROOT)/server
LUA_VERSION="5.2" TOLUA_VERSION="5.2"
LUA_INCLUDE=/usr/include LUA_INCLUDE=/usr/include
LUA_DIR=/usr LUA_DIR=/usr
if [ -d /usr/local/include/lua5.3 ]; then if [ -d /usr/local/include/lua ]; then
LUA_VERSION="5.3" TOLUA_VERSION="5.2"
LUA_INCLUDE=/usr/local/include/lua5.3 LUA_INCLUDE=/usr/local/include/lua
elif [ -d /usr/include/lua5.2 ]; then elif [ -d /usr/include/lua5.2 ]; then
export LUA_DIR=/usr TOLUA_VERSION="5.2"
LUA_VERSION="5.2"
LUA_INCLUDE=/usr/include/lua5.2 LUA_INCLUDE=/usr/include/lua5.2
elif [ -d /usr/include/lua5.1 ]; then elif [ -d /usr/include/lua5.1 ]; then
LUA_VERSION="5.1" TOLUA_VERSION="5.1"
LUA_INCLUDE=/usr/include/lua5.1 LUA_INCLUDE=/usr/include/lua5.1
elif [ -d /usr/local/include/lua5.1 ]; then elif [ -d /usr/local/include/lua5.1 ]; then
export LUA_DIR=/usr/local LUA_DIR=/usr/local
LUA_VERSION="5.1" TOLUA_VERSION="5.1"
LUA_INCLUDE=/usr/local/include/lua5.1 LUA_INCLUDE=/usr/local/include/lua5.1
fi fi
@ -116,8 +115,8 @@ if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then
echo "tolua is not installed, building from source" echo "tolua is not installed, building from source"
cd $ROOT cd $ROOT
if [ ! -d tolua/include ]; then if [ ! -d tolua/include ]; then
echo "fetching tolua ${LUA_VERSION} from github..." echo "fetching tolua ${TOLUA_VERSION} from github..."
git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua git clone https://github.com/ennorehling/tolua-${TOLUA_VERSION}.git tolua
fi fi
echo "building tolua..." echo "building tolua..."
cd tolua cd tolua