From 0de705eb99b295d4b36b874eb944384b74d7e64a Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 4 May 2017 15:01:15 +0200 Subject: Removed binary ToLua++ from build. A local Lua executable is used instead. --- src/Bindings/CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src') 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