working on a new tolua build step that supports 5.1

This commit is contained in:
Enno Rehling 2016-09-30 19:46:29 +00:00
parent 42c44724f8
commit 04333e71d6
5 changed files with 14 additions and 10 deletions

3
.gitmodules vendored
View File

@ -26,6 +26,3 @@
path = storage
url = https://github.com/ennorehling/storage.git
branch = master
[submodule "tolua"]
path = tolua
url = https://github.com/ennorehling/tolua.git

View File

@ -35,11 +35,6 @@ fi
git submodule update
if [ -z `which tolua` ]; then
echo "build tolua"
cd $ROOT/tolua ; make
fi
echo "build eressea"
cd $ROOT/$BUILD
VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')

View File

@ -44,7 +44,18 @@ ARGS=" -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \
path="$(which tolua)"
if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then
echo "tolua is not installed, building from source"
cd $ROOT/tolua ; make
cd $ROOT
if [ ! -d tolua ]; then
LUA_VERSION="5.2"
if [ ! -d /usr/include/lua5.2 ] ; then
LUA_VERSION="5.1"
fi
echo "fetching tolua ${LUA_VERSION} from github..."
git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua
fi
echo "building tolua..."
cd tolua
make
ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua"
else
echo "tolua is $path"

View File

@ -740,7 +740,9 @@ void kernel_done(void)
/* calling this function releases memory assigned to static variables, etc.
* calling it is optional, e.g. a release server will most likely not do it.
*/
#ifdef USE_LIBXML2
xml_done();
#endif
attrib_done();
item_done();
message_done();

1
tolua

@ -1 +0,0 @@
Subproject commit 32cc6a3e78238278bc5b1fb8566526558e5afdda