1
0

Jenkins fixes

This commit is contained in:
Tiger Wang
2020-07-12 23:38:13 +01:00
parent bd20afd6ce
commit 3cf671b4fc
8 changed files with 12 additions and 11 deletions

View File

@@ -62,7 +62,7 @@ function(link_dependencies TARGET)
fmt::fmt
jsoncpp_lib
lsqlite
lua
lualib
luaexpat
mbedtls
SQLiteCpp

View File

@@ -2,7 +2,7 @@ function(emit_fixups)
# TODO these should be in the submodules
# Under Windows, we need Lua as DLL; on *nix we need it linked statically:
if (WIN32)
target_compile_definitions(lua PUBLIC LUA_BUILD_AS_DLL)
target_compile_definitions(lualib PUBLIC LUA_BUILD_AS_DLL)
endif()
# Let Lua use additional checks on its C API. This is only compiled into Debug builds:

View File

@@ -107,8 +107,8 @@ function(enable_bindings_generation)
# Generate the bindings:
add_custom_command(
OUTPUT ${BINDING_OUTPUTS}
COMMAND luaexe BindingsProcessor.lua
COMMAND lua BindingsProcessor.lua
WORKING_DIRECTORY ${BINDINGS_FOLDER}
DEPENDS ${BINDING_DEPENDENCIES} luaexe
DEPENDS ${BINDING_DEPENDENCIES} lua
)
endfunction()

View File

@@ -82,6 +82,7 @@ popd
sha1sum Cuberite.tar.gz > Cuberite.tar.gz.sha1
# Package ProtoProxy
pushd Tools/ProtoProxy
sha1sum ProtoProxy > ProtoProxy.sha1
popd
# This tool is very out of date, uncomment when it's being worked on again
# pushd Tools/ProtoProxy
# sha1sum ProtoProxy > ProtoProxy.sha1
# popd

Submodule lib/lua updated: e5942d9d88...6fb92772dc