flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Jenkins crosscompile

This commit is contained in:
Tiger Wang 2020-07-13 12:35:38 +01:00
parent 1c714312eb
commit c94f3c7ae0
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMake/Fixups.cmake
View File

@ -1,13 +1,4 @@
function(emit_fixups) 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") if(NOT MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
# mbed TLS uses the frame pointer's register in inline assembly for its bignum implementation: # 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 # https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here

2
CMake/GroupSources.cmake
View File

@ -9,7 +9,7 @@ function(group_sources)
expat expat
fmt fmt
jsoncpp_lib jsoncpp_lib
lua lualib
luaexpat luaexpat
mbedcrypto mbedcrypto
mbedtls mbedtls

2
jenkinsbuild.sh
View File

@ -63,7 +63,7 @@ then
fi fi
# Build # 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 make -j 2

2
lib/lua

@ -1 +1 @@
Subproject commit 6fb92772dc1343fd4e92a64e6a49940d188523c3 Subproject commit 9972ba6d45f572b3569f907421fbc4866b4d1bfb

2
lib/sqlite

@ -1 +1 @@
Subproject commit 0bd062f9653f19ca9f59040f2fbb04fe9f753e0d Subproject commit 4435d7e4297220228174385302d430f1fdf3d090