From 4c7996272980c3ded79a54a7310c73cf0af224b9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 17:48:35 +0200 Subject: [PATCH] add tolua submodule, kill all references to tolua++ --- .gitmodules | 3 +++ CMakeLists.txt | 2 +- s/build | 1 + tolua | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 tolua diff --git a/.gitmodules b/.gitmodules index e5eb61079..f58803ffc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,3 +29,6 @@ path = storage url = git://github.com/badgerman/storage.git branch = master +[submodule "tolua"] + path = tolua + url = git@github.com:ennorehling/tolua.git diff --git a/CMakeLists.txt b/CMakeLists.txt index dff18907e..9730625b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ find_package (LibXml2) find_package (SQLite3) find_package (Curses) find_package (Lua REQUIRED) -find_package (ToLua) +find_package (ToLua REQUIRED) add_subdirectory (cutest) add_subdirectory (crypto) diff --git a/s/build b/s/build index d36cbbf13..44d4ad6d5 100755 --- a/s/build +++ b/s/build @@ -30,6 +30,7 @@ if [ ! -d $ROOT/$BIN_DIR ]; then fi git submodule update +cd $ROOT/tolua ; make cd $ROOT/$BIN_DIR make $MAKEOPTS && make test cd $OLDPWD diff --git a/tolua b/tolua new file mode 160000 index 000000000..e046e5d05 --- /dev/null +++ b/tolua @@ -0,0 +1 @@ +Subproject commit e046e5d05c3ef425b0f43203bae9a77486c74e55