diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-07-13 13:35:38 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-07-13 13:35:38 +0200 |
| commit | c94f3c7ae0de87e3324f5ff01800ec34c830d4de (patch) | |
| tree | 5483aaf8207e4c7c5635997ffa35ab86cc688b42 | |
| parent | Remove unnecessary includes (diff) | |
| download | cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.tar cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.tar.gz cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.tar.bz2 cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.tar.lz cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.tar.xz cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.tar.zst cuberite-c94f3c7ae0de87e3324f5ff01800ec34c830d4de.zip | |
| -rw-r--r-- | CMake/Fixups.cmake | 9 | ||||
| -rw-r--r-- | CMake/GroupSources.cmake | 2 | ||||
| -rwxr-xr-x | jenkinsbuild.sh | 2 | ||||
| m--------- | lib/lua | 0 | ||||
| m--------- | lib/sqlite | 0 |
5 files changed, 2 insertions, 11 deletions
diff --git a/CMake/Fixups.cmake b/CMake/Fixups.cmake index f8f616254..f671bd6ac 100644 --- a/CMake/Fixups.cmake +++ b/CMake/Fixups.cmake @@ -1,13 +1,4 @@ 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(lualib PUBLIC LUA_BUILD_AS_DLL) - endif() - - # Let Lua use additional checks on its C API. This is only compiled into Debug builds: - target_compile_definitions(lua PRIVATE LUA_USE_APICHECK) - if(NOT MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm") # mbed TLS uses the frame pointer's register in inline assembly for its bignum implementation: # https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here diff --git a/CMake/GroupSources.cmake b/CMake/GroupSources.cmake index a8706794d..a6d2bcc0e 100644 --- a/CMake/GroupSources.cmake +++ b/CMake/GroupSources.cmake @@ -9,7 +9,7 @@ function(group_sources) expat fmt jsoncpp_lib - lua + lualib luaexpat mbedcrypto mbedtls diff --git a/jenkinsbuild.sh b/jenkinsbuild.sh index 56ce83802..098bd68b9 100755 --- a/jenkinsbuild.sh +++ b/jenkinsbuild.sh @@ -63,7 +63,7 @@ then fi # Build -CXX=$CXXCOMP CC=$CCOMP cmake . -DNO_NATIVE_OPTIMIZATION=1 -DBUILD_TOOLS=1 ${CACHE_ARGS} ${TOOLCHAINFILE} ${COMPILEMODE} ${FORCE32} +CXX=$CXXCOMP CC=$CCOMP cmake . -DNO_NATIVE_OPTIMIZATION=1 ${CACHE_ARGS} ${TOOLCHAINFILE} ${COMPILEMODE} ${FORCE32} make -j 2 diff --git a/lib/lua b/lib/lua -Subproject 6fb92772dc1343fd4e92a64e6a49940d188523c +Subproject 9972ba6d45f572b3569f907421fbc4866b4d1bf diff --git a/lib/sqlite b/lib/sqlite -Subproject 0bd062f9653f19ca9f59040f2fbb04fe9f753e0 +Subproject 4435d7e4297220228174385302d430f1fdf3d09 |