diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-03-04 15:01:26 +0100 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-03-04 15:01:57 +0100 |
| commit | da4ec54f5296135ab1614b6ae91b0897456de952 (patch) | |
| tree | 6f9be2e495ad4804d92424b288687e127e8a54e5 /contrib | |
| parent | 7822a22d63d78ab737aad98b5e44fc78d03d15e3 (diff) | |
fix: x86_64-w64-mingw32
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/.gitignore | 1 | ||||
| -rw-r--r-- | contrib/depends/Makefile | 10 | ||||
| -rwxr-xr-x | contrib/depends/gen_toolchain.cmake.sh | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/contrib/depends/.gitignore b/contrib/depends/.gitignore index 8f4b1d2..e17c25c 100644 --- a/contrib/depends/.gitignore +++ b/contrib/depends/.gitignore @@ -1,2 +1,3 @@ _ *-*-* +_native
\ No newline at end of file diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile index c88eba5..32cca84 100644 --- a/contrib/depends/Makefile +++ b/contrib/depends/Makefile @@ -2,8 +2,8 @@ HOST ?= -PACKAGES = native/cmake,native/python@3.14,native/git,native/_,native/make,native/cmake-toolchain,boost,zeromq,unbound,sodium,openssl,zlib -SIMPLYBS_HASH = d1f3c85a5b2dd2e612a4d3e431d8d0bc2cb399fe +PACKAGES = native/cmake,native/python@3.14,native/git,native/_,native/make,native/cmake-toolchain,icu4c,boost@1_90_0,zeromq,unbound,sodium,openssl,libiconv,zlib +SIMPLYBS_HASH = 0414efe7204404aa50911eaaeab885910c1ef313 all: simplybs $(if $(HOST),sbs-build-$(HOST),) @if [ -z "$(HOST)" ]; then \ @@ -28,8 +28,8 @@ simplybs: cd simplybs && git reset --hard sbs-build-%: - # cd simplybs && env SIMPLYBS_ENV_DIR=$(PWD)/$* go run . -cleanup - cd simplybs && env SIMPLYBS_ENV_DIR=$(PWD)/$* go run . -host $* -package $(PACKAGES) -build + # cd simplybs && env SIMPLYBS_ENV_NATIVE_DIR=$(PWD)/_native SIMPLYBS_ENV_DIR=$(PWD)/$* go run . -cleanup + cd simplybs && env SIMPLYBS_NATIVE_ENV_DIR=$(PWD)/_native SIMPLYBS_ENV_DIR=$(PWD)/$* go run . -host $* -package $(PACKAGES) -build cd simplybs && rm -rf $(PWD)/$* - cd simplybs && env SIMPLYBS_ENV_DIR=$(PWD)/$* go run . -host $* -package $(PACKAGES) -extract + cd simplybs && env SIMPLYBS_NATIVE_ENV_DIR=$(PWD)/_native SIMPLYBS_ENV_DIR=$(PWD)/$* go run . -host $* -package $(PACKAGES) -extract env HOST=$* ./gen_toolchain.cmake.sh $*/share/toolchain.cmake diff --git a/contrib/depends/gen_toolchain.cmake.sh b/contrib/depends/gen_toolchain.cmake.sh index 0810cf4..df0dd73 100755 --- a/contrib/depends/gen_toolchain.cmake.sh +++ b/contrib/depends/gen_toolchain.cmake.sh @@ -56,6 +56,7 @@ cmake_policy(SET CMP0077 NEW) # Ensure 'option' honors normal variables SET(CMAKE_SYSTEM_NAME @cmake_system_name@) SET(CMAKE_SYSTEM_PROCESSOR @arch@) SET(CMAKE_BUILD_TYPE @release_type@) +SET(CMAKE_CXX_STANDARD 14) OPTION(STATIC "Link libraries statically" ON) OPTION(TREZOR_DEBUG "Main trezor debugging switch" OFF) @@ -246,6 +247,9 @@ endif() link_directories(@prefix@/lib) include_directories(@prefix@/include) +if(EXISTS "@prefix@/include/c++/15.2.0") + include_directories("@prefix@/include/c++/15.2.0") +endif() include_directories(@prefix@/include/wownero_seed) add_definitions(-DPOLYSEED_STATIC=ON) |