From 45f373739e74cd561a5b55145e0dfbe0019af608 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Tue, 10 Mar 2026 14:52:23 +0100 Subject: fixes --- build_single.sh | 2 +- .../src/main/cpp/monero_checksum.h | 4 ++-- .../src/main/cpp/wownero_checksum.h | 25 +++++++++++++++++----- zano_libwallet2_api_c/src/main/cpp/zano_checksum.h | 25 +++++++++++++++++----- .../src/main/cpp/zano_wallet2_api_c.cpp | 2 +- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/build_single.sh b/build_single.sh index 760b4a5..ebc30e3 100755 --- a/build_single.sh +++ b/build_single.sh @@ -60,7 +60,7 @@ pushd contrib/depends then sbs_BOOST_VERSION=1_83_0 fi - echo env PATH="$PATH" make "$NPROC" HOST="$HOST_ABI" BOOST_VERSION="${sbs_BOOST_VERSION}" + env PATH="$PATH" make "$NPROC" HOST="$HOST_ABI" BOOST_VERSION="${sbs_BOOST_VERSION}" popd # source contrib/depends/_native/_source_me source contrib/depends/$HOST_ABI/_source_me diff --git a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h index 2636eb1..3f1691a 100644 --- a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h +++ b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h @@ -1,5 +1,5 @@ -#ifndef MONEROC_CHECKSUMS -#define MONEROC_CHECKSUMS +#ifndef MONEROC_CHECKSUMS_MONERO +#define MONEROC_CHECKSUMS_MONERO #ifdef __cplusplus extern "C" { diff --git a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h index 59f205c..3022e30 100644 --- a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h +++ b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h @@ -1,6 +1,21 @@ -#ifndef MONEROC_CHECKSUMS -#define MONEROC_CHECKSUMS -const char * WOWNERO_wallet2_api_c_h_sha256 = "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827"; -const char * WOWNERO_wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-cfd2a696245be112a01936d1f2f41b6eb7558376"; -const char * WOWNERO_wallet2_api_c_exp_sha256 = "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba"; +#ifndef MONEROC_CHECKSUMS_WOWNERO +#define MONEROC_CHECKSUMS_WOWNERO +#ifdef __cplusplus +extern "C" +{ +#endif + +#ifdef __MINGW32__ + #define ADDAPI __declspec(dllexport) +#else + #define ADDAPI __attribute__((__visibility__("default"))) +#endif + +extern ADDAPI const char * WOWNERO_wallet2_api_c_h_sha256; +extern ADDAPI const char * WOWNERO_wallet2_api_c_cpp_sha256; +extern ADDAPI const char * WOWNERO_wallet2_api_c_exp_sha256; + +#ifdef __cplusplus +} +#endif #endif diff --git a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h index 90e9f30..7d9b572 100644 --- a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h +++ b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h @@ -1,6 +1,21 @@ -#ifndef MONEROC_CHECKSUMS -#define MONEROC_CHECKSUMS -const char * ZANO_wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd"; -const char * ZANO_wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-b372a99c7ada82caac53b677d9aaa7c0902e3b0b"; -const char * ZANO_wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2"; +#ifndef MONEROC_CHECKSUMS_ZANO +#define MONEROC_CHECKSUMS_ZANO +#ifdef __cplusplus +extern "C" +{ +#endif + +#ifdef __MINGW32__ + #define ADDAPI __declspec(dllexport) +#else + #define ADDAPI __attribute__((__visibility__("default"))) +#endif + +extern ADDAPI const char * ZANO_wallet2_api_c_h_sha256; +extern ADDAPI const char * ZANO_wallet2_api_c_cpp_sha256; +extern ADDAPI const char * ZANO_wallet2_api_c_exp_sha256; + +#ifdef __cplusplus +} +#endif #endif diff --git a/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.cpp b/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.cpp index b60ba56..364fdb8 100644 --- a/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.cpp +++ b/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "zano_checksum.h" #include "helpers.hpp" #include "../../../../zano/src/wallet/plain_wallet_api.h" +#include "zano_checksum.h" #ifdef __cplusplus extern "C" -- cgit v1.2.3