summaryrefslogtreecommitdiff
path: root/depends/lua
diff options
context:
space:
mode:
authorWarmist2012-03-26 18:48:24 +0300
committerWarmist2012-03-26 18:48:24 +0300
commit3761426ef5ce79696ef942547b3fbcd7b4f3fcae (patch)
tree5586f5ecae14439a975682c26a58307e82232a53 /depends/lua
parent18c94f8000ab0f395d7897b0f33a5665d1a77b9d (diff)
downloaddfhack-3761426ef5ce79696ef942547b3fbcd7b4f3fcae.tar.gz
dfhack-3761426ef5ce79696ef942547b3fbcd7b4f3fcae.tar.bz2
dfhack-3761426ef5ce79696ef942547b3fbcd7b4f3fcae.tar.xz
Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload.
Diffstat (limited to 'depends/lua')
-rw-r--r--depends/lua/CMakeLists.txt1
-rw-r--r--depends/lua/src/linit.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt
index aa0a1b91..3770986d 100644
--- a/depends/lua/CMakeLists.txt
+++ b/depends/lua/CMakeLists.txt
@@ -76,6 +76,7 @@ src/ltm.c
src/lundump.c
src/lvm.c
src/lzio.c
+src/bit.c
)
# compile with C++ compiler
set_source_files_properties(${SRC_LIBLUA} PROPERTIES LANGUAGE CXX)
diff --git a/depends/lua/src/linit.c b/depends/lua/src/linit.c
index c1f90dfa..198d786e 100644
--- a/depends/lua/src/linit.c
+++ b/depends/lua/src/linit.c
@@ -12,7 +12,7 @@
#include "lualib.h"
#include "lauxlib.h"
-
+#include "bit.h"
static const luaL_Reg lualibs[] = {
{"", luaopen_base},
@@ -23,6 +23,7 @@ static const luaL_Reg lualibs[] = {
{LUA_STRLIBNAME, luaopen_string},
{LUA_MATHLIBNAME, luaopen_math},
{LUA_DBLIBNAME, luaopen_debug},
+ {"bit",luaopen_bit},
{NULL, NULL}
};