diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/Makefile | 4 | ||||
| -rwxr-xr-x | contrib/depends/gen_toolchain.cmake.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile index 92e9036..1a7ad47 100644 --- a/contrib/depends/Makefile +++ b/contrib/depends/Makefile @@ -3,8 +3,8 @@ HOST ?= BOOST_VERSION ?= 1_90_0 -PACKAGES = native/cmake,native/python@3.14,native/git,native/_,native/make,native/cmake-toolchain,icu4c,boost@$(BOOST_VERSION),zeromq,unbound,sodium,openssl,libiconv,zlib -SIMPLYBS_HASH = 0ea74cb120b06156ce16118f86dc5b7d23a93c46 +PACKAGES = native/protobuf,native/cmake,native/python@3.14,native/git,native/_,native/make,native/cmake-toolchain,icu4c,boost@$(BOOST_VERSION),zeromq,unbound,sodium,openssl,libiconv,zlib,protobuf +SIMPLYBS_HASH = 8621f898aada59d15095a63e6b6746c69c2c5b76 all: simplybs $(if $(HOST),sbs-build-$(HOST),) @if [ -z "$(HOST)" ]; then \ diff --git a/contrib/depends/gen_toolchain.cmake.sh b/contrib/depends/gen_toolchain.cmake.sh index 9ed2621..5d48edd 100755 --- a/contrib/depends/gen_toolchain.cmake.sh +++ b/contrib/depends/gen_toolchain.cmake.sh @@ -155,7 +155,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(LLVM_ENABLE_PIC OFF) SET(LLVM_ENABLE_PIE OFF) elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") - add_definitions(-DUSE_DEVICE_TREZOR=OFF) + add_definitions(-DUSE_DEVICE_TREZOR=ON) SET(ANDROID TRUE) if(ARCHITECTURE STREQUAL "armv7a") SET(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a") @@ -181,7 +181,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(USE_DEVICE_TREZOR OFF) + set(USE_DEVICE_TREZOR ON) add_definitions(-DUSE_DEVICE_LEDGER=ON) SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) |