1
0

Removed binary ToLua++ from build.

A local Lua executable is used instead.
This commit is contained in:
Mattes D 2017-05-04 15:01:15 +02:00 committed by Lukas Pioch
parent c939720c10
commit 0de705eb99
5 changed files with 8 additions and 10 deletions

View File

@ -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
)

1
Server/.gitignore vendored
View File

@ -5,6 +5,7 @@
*.ini
Cuberite
Cuberite_debug
luaexe
CommLogs/
GalExports/
GalExportWeb/

@ -1 +1 @@
Subproject commit 5f54aca0d4272e5c260adb100e8249c560a853ac
Subproject commit 19e8b4ffe13b9acb6c63688ba0038febb65af80b

View File

@ -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 ()

View File

@ -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()