From 0de705eb99b295d4b36b874eb944384b74d7e64a Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 4 May 2017 15:01:15 +0200
Subject: Removed binary ToLua++ from build.

A local Lua executable is used instead.
---
 CMakeLists.txt              | 4 ++--
 Server/.gitignore           | 1 +
 lib/lua                     | 2 +-
 src/Bindings/CMakeLists.txt | 4 ++--
 src/CMakeLists.txt          | 7 ++-----
 5 files changed, 8 insertions(+), 10 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
index 5f54aca0d..19e8b4ffe 160000
--- a/lib/lua
+++ b/lib/lua
@@ -1 +1 @@
-Subproject commit 5f54aca0d4272e5c260adb100e8249c560a853ac
+Subproject commit 19e8b4ffe13b9acb6c63688ba0038febb65af80b
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()
-- 
cgit v1.2.3