Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'release' into develop

Browse source
This commit is contained in:
cryptozoidberg 2025-08-01 13:52:15 +01:00
commit e3186aef40
No known key found for this signature in database
GPG key ID: 2E10CC61CAC8F36D
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -32,8 +32,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
add_definitions(-DMOBILE_WALLET_BUILD) add_definitions(-DMOBILE_WALLET_BUILD)
if(CMAKE_SYSTEM_NAME STREQUAL "iOS" ) if(CMAKE_SYSTEM_NAME STREQUAL "iOS" )
add_definitions(-DIOS_BUILD) add_definitions(-DIOS_BUILD)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode -Wno-enum-constexpr-conversion")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode -Wno-enum-constexpr-conversion")
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Android") if(CMAKE_SYSTEM_NAME STREQUAL "Android")
add_definitions(-DANDROID_BUILD) add_definitions(-DANDROID_BUILD)

1
utils/p2p_manual_config/proxy_via_seed_nodes/p2p_manual_config.json
View file

@ -29,6 +29,7 @@
"use_only_priority_peers": true, "use_only_priority_peers": true,
"priority_peers_list": [ "priority_peers_list": [
"95.217.43.225:11121", "95.217.43.225:11121",
"94.130.137.230:11121",
"95.217.42.247:11121", "95.217.42.247:11121",
"94.130.160.115:11121", "94.130.160.115:11121",
"195.201.107.230:11121", "195.201.107.230:11121",