From 3cf463e1250babee8be449ca28925f701e7fa29a Mon Sep 17 00:00:00 2001 From: cyan Date: Tue, 26 Nov 2024 03:22:30 +0000 Subject: - multithread build system - fix android, mingw and linux build issues - remove dependency check - update Dockerfile to include pigz - show a message when pigz is missing - fix devcontainer mingw setup (missing ENV) --- contrib/depends/toolchain.cmake.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'contrib/depends/toolchain.cmake.in') diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 8a57e23..7c40918 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -10,6 +10,8 @@ OPTION(STATIC "Link libraries statically" ON) OPTION(TREZOR_DEBUG "Main trezor debugging switch" OFF) OPTION(BUILD_TESTS "Build tests." OFF) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + SET(STATIC ON) SET(UNBOUND_STATIC ON) SET(ARCH "default") @@ -114,14 +116,22 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") elseif(ARCHITECTURE STREQUAL "aarch64") SET(CMAKE_ANDROID_ARCH_ABI "arm64-v8a") SET(CMAKE_SYSTEM_PROCESSOR "aarch64") + elseif(ARCHITECTURE STREQUAL "x86_64") + SET(MONERO_WALLET_CRYPTO_LIBRARY amd64-64-24k) + SET(CMAKE_ANDROID_ARCH_ABI x86_64) + SET(CMAKE_SYSTEM_PROCESSOR "x86_64") + else() + message(SEND_ERROR Unsupported android architecture) endif() - SET(CMAKE_ANDROID_STANDALONE_TOOLCHAIN @prefix@/native) + # SET(CMAKE_ANDROID_STANDALONE_TOOLCHAIN @prefix@/native) SET(_ANDROID_STANDALONE_TOOLCHAIN_API 21) + SET(__ANDROID_API__ 21) + SET(CMAKE_SYSTEM_VERSION 1) SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") set(USE_DEVICE_TREZOR OFF) - set(DHIDAPI_DUMMY ON) + add_definitions(-DHIDAPI_DUMMY=ON) SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) else() -- cgit v1.2.3