summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2017-05-04 15:01:15 +0200
committerLukas Pioch <lukas@zgow.de>2017-05-04 17:38:05 +0200
commit0de705eb99b295d4b36b874eb944384b74d7e64a (patch)
tree9291e1feb590d9b6e4b59d91b7da01cedb5746c9
parentGen: Added a simple PieceGeneratorBFSTree test. (diff)
downloadcuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.tar
cuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.tar.gz
cuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.tar.bz2
cuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.tar.lz
cuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.tar.xz
cuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.tar.zst
cuberite-0de705eb99b295d4b36b874eb944384b74d7e64a.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt4
-rw-r--r--Server/.gitignore1
m---------lib/lua0
-rw-r--r--src/Bindings/CMakeLists.txt4
-rw-r--r--src/CMakeLists.txt7
5 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1b154aa3..dfb191abf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,7 +250,7 @@ endif()
add_subdirectory(lib/jsoncpp/)
add_subdirectory(lib/zlib/)
add_subdirectory(lib/lua/)
-add_subdirectory(lib/tolua++/)
+add_subdirectory(lib/tolua++/ EXCLUDE_FROM_ALL)
add_subdirectory(lib/sqlite/)
add_subdirectory(lib/SQLiteCpp/)
add_subdirectory(lib/expat/)
@@ -305,7 +305,7 @@ if (MSVC)
)
set_target_properties(
luaproxy
- tolua
+ luaexe
PROPERTIES FOLDER Support
)
diff --git a/Server/.gitignore b/Server/.gitignore
index 5e60f3348..5796584a9 100644
--- a/Server/.gitignore
+++ b/Server/.gitignore
@@ -5,6 +5,7 @@
*.ini
Cuberite
Cuberite_debug
+luaexe
CommLogs/
GalExports/
GalExportWeb/
diff --git a/lib/lua b/lib/lua
-Subproject 5f54aca0d4272e5c260adb100e8249c560a853a
+Subproject 19e8b4ffe13b9acb6c63688ba0038febb65af80
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index c4fae1148..ccd6f0a3f 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -147,9 +147,9 @@ if (NOT MSVC)
else()
ADD_CUSTOM_COMMAND(
OUTPUT ${BINDING_OUTPUTS}
- COMMAND tolua -L BindingsProcessor.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
+ COMMAND luaexe BindingsProcessor.lua
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${BINDING_DEPENDENCIES} tolua
+ DEPENDS ${BINDING_DEPENDENCIES} luaexe
)
endif()
endif ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db0372315..93a1fa368 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -310,13 +310,10 @@ if (MSVC)
ADD_CUSTOM_COMMAND(
OUTPUT ${BINDING_OUTPUTS}
- # Copy the Lua DLL into the Bindings folder, so that tolua can run from there:
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/Server/lua51.dll ./lua51.dll
-
# Regenerate bindings:
- COMMAND tolua -L BindingsProcessor.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
+ COMMAND luaexe BindingsProcessor.lua
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/
- DEPENDS ${BINDINGS_DEPENDENCIES} tolua
+ DEPENDS ${BINDINGS_DEPENDENCIES} luaexe
)
endif()
endif()