diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-07-13 00:38:13 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-07-13 00:38:13 +0200 |
| commit | 3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a (patch) | |
| tree | db7305097757336a484fdf574d3d0b9f2b014edb | |
| parent | Reduce buildlogspam (diff) | |
| download | cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.tar cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.tar.gz cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.tar.bz2 cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.tar.lz cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.tar.xz cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.tar.zst cuberite-3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a.zip | |
| -rw-r--r-- | CMake/AddDependencies.cmake | 2 | ||||
| -rw-r--r-- | CMake/Fixups.cmake | 2 | ||||
| -rw-r--r-- | CMake/GenerateBindings.cmake | 4 | ||||
| -rwxr-xr-x | jenkinsbuild.sh | 7 | ||||
| m--------- | lib/lua | 0 | ||||
| m--------- | lib/luaproxy | 0 | ||||
| m--------- | lib/sqlite | 0 | ||||
| m--------- | lib/tolua++ | 0 |
8 files changed, 8 insertions, 7 deletions
diff --git a/CMake/AddDependencies.cmake b/CMake/AddDependencies.cmake index 5173e4487..971a338cc 100644 --- a/CMake/AddDependencies.cmake +++ b/CMake/AddDependencies.cmake @@ -62,7 +62,7 @@ function(link_dependencies TARGET) fmt::fmt jsoncpp_lib lsqlite - lua + lualib luaexpat mbedtls SQLiteCpp diff --git a/CMake/Fixups.cmake b/CMake/Fixups.cmake index 374196d09..f8f616254 100644 --- a/CMake/Fixups.cmake +++ b/CMake/Fixups.cmake @@ -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: diff --git a/CMake/GenerateBindings.cmake b/CMake/GenerateBindings.cmake index 584ad1b66..d91d26a03 100644 --- a/CMake/GenerateBindings.cmake +++ b/CMake/GenerateBindings.cmake @@ -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() diff --git a/jenkinsbuild.sh b/jenkinsbuild.sh index ab30c74be..56ce83802 100755 --- a/jenkinsbuild.sh +++ b/jenkinsbuild.sh @@ -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 diff --git a/lib/lua b/lib/lua -Subproject e5942d9d88221dc02b824f5bda0db9876fa92ba +Subproject 6fb92772dc1343fd4e92a64e6a49940d188523c diff --git a/lib/luaproxy b/lib/luaproxy -Subproject 62ee088a33a4e5eeb69cb80cd261e6574c2cb71 +Subproject 9e4b11990b1e4e368f1cacb4cbf9d0e908da96b diff --git a/lib/sqlite b/lib/sqlite -Subproject 01cbf6d5a5ba91dd78d17604865dd3aebe1b509 +Subproject 0bd062f9653f19ca9f59040f2fbb04fe9f753e0 diff --git a/lib/tolua++ b/lib/tolua++ -Subproject 23cd44840dc9405f4f7df34a621a351062359b8 +Subproject 4d24aa316898964c23896fbb7419bdaa23638c2 |