diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-18 21:10:51 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-18 21:10:51 +0200 |
| commit | 37140ae57835680d2c4fb3aa365082622d3a150e (patch) | |
| tree | 89a636c74375b3c9f0fe77b20ecbadc693bd0989 /lib/tolua++ | |
| parent | Merge branch 'master' of https://github.com/mc-server/MCServer into portals (diff) | |
| parent | Monster fixes (diff) | |
| download | cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.tar cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.tar.gz cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.tar.bz2 cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.tar.lz cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.tar.xz cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.tar.zst cuberite-37140ae57835680d2c4fb3aa365082622d3a150e.zip | |
Diffstat (limited to 'lib/tolua++')
| -rw-r--r-- | lib/tolua++/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | lib/tolua++/src/bin/lua/_driver.lua | 30 |
2 files changed, 17 insertions, 18 deletions
diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index e68a0e15b..12054323b 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -44,14 +44,13 @@ file(GLOB BIN_SOURCE "src/bin/*.c" ) - - add_executable(tolua ${BIN_SOURCE}) add_library(tolualib ${LIB_SOURCE}) +target_link_libraries(tolualib lua) #m is the standard math librarys if(UNIX) target_link_libraries(tolua m ${DYNAMIC_LOADER}) endif() -target_link_libraries(tolua lua tolualib) +target_link_libraries(tolua tolualib lua) diff --git a/lib/tolua++/src/bin/lua/_driver.lua b/lib/tolua++/src/bin/lua/_driver.lua index 21db96098..87ecd42ea 100644 --- a/lib/tolua++/src/bin/lua/_driver.lua +++ b/lib/tolua++/src/bin/lua/_driver.lua @@ -6,21 +6,21 @@ if mobdebugfound then mobdebug.start() end -- The list of valid arguments that the ToLua scripts can process: local KnownArgs = { ['v'] = true, - ['h'] = true, - ['p'] = true, - ['P'] = true, - ['o'] = true, - ['n'] = true, - ['H'] = true, - ['S'] = true, - ['1'] = true, - ['L'] = true, - ['D'] = true, - ['W'] = true, - ['C'] = true, - ['E'] = true, - ['t'] = true, - ['q'] = true, + ['h'] = true, + ['p'] = true, + ['P'] = true, + ['o'] = true, + ['n'] = true, + ['H'] = true, + ['S'] = true, + ['1'] = true, + ['L'] = true, + ['D'] = true, + ['W'] = true, + ['C'] = true, + ['E'] = true, + ['t'] = true, + ['q'] = true, } |