summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCzarek Nakamoto <cyjan@mrcyjanek.net>2024-12-06 06:39:08 -0600
committerCzarek Nakamoto <cyjan@mrcyjanek.net>2024-12-06 06:39:08 -0600
commit0cd78fdb8a03cc1cfbb4ec0a4d26158626fc7d4e (patch)
tree4c67bcc17a84e2a8a026a44030714a45275c8117
parentd70685a2deab5ae38d70f99c6a57a25475062e43 (diff)
fix zano build
-rw-r--r--impls/monero.dart/lib/src/checksum_zano.dart2
-rw-r--r--impls/monero.ts/checksum_zano.ts2
-rw-r--r--monero_libwallet2_api_c/CMakeLists.txt16
-rw-r--r--monero_libwallet2_api_c/src/main/cpp/helpers.hpp1
-rw-r--r--zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp1
-rw-r--r--zano_libwallet2_api_c/src/main/cpp/zano_checksum.h2
6 files changed, 19 insertions, 5 deletions
diff --git a/impls/monero.dart/lib/src/checksum_zano.dart b/impls/monero.dart/lib/src/checksum_zano.dart
index 80854c3..b8b879a 100644
--- a/impls/monero.dart/lib/src/checksum_zano.dart
+++ b/impls/monero.dart/lib/src/checksum_zano.dart
@@ -1,4 +1,4 @@
// ignore_for_file: constant_identifier_names
const String wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd";
-const String wallet2_api_c_cpp_sha256 = "94c3f49fe8a8acd9693c08712b9c38ecdb3f1bfed0a22b6c3462228ed64b82ba-2817090c8ac7639d6f697d00fc8bcba2b3681d90";
+const String wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-2817090c8ac7639d6f697d00fc8bcba2b3681d90";
const String wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2";
diff --git a/impls/monero.ts/checksum_zano.ts b/impls/monero.ts/checksum_zano.ts
index 1a38a57..2af89bd 100644
--- a/impls/monero.ts/checksum_zano.ts
+++ b/impls/monero.ts/checksum_zano.ts
@@ -1,5 +1,5 @@
export const zanoChecksum = {
wallet2_api_c_h_sha256: "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd",
- wallet2_api_c_cpp_sha256: "94c3f49fe8a8acd9693c08712b9c38ecdb3f1bfed0a22b6c3462228ed64b82ba-2817090c8ac7639d6f697d00fc8bcba2b3681d90",
+ wallet2_api_c_cpp_sha256: "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-2817090c8ac7639d6f697d00fc8bcba2b3681d90",
wallet2_api_c_exp_sha256: "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2",
}
diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt
index 199a71b..9cb27a9 100644
--- a/monero_libwallet2_api_c/CMakeLists.txt
+++ b/monero_libwallet2_api_c/CMakeLists.txt
@@ -112,7 +112,19 @@ if (${MONERO_FLAVOR} STREQUAL "monero")
elseif(${MONERO_FLAVOR} STREQUAL "wownero")
set(WALLET_TARGETS wallet_api ${wallet_api_LIB_DEPENDS}) # wallet_api_LIB_DEPENDS
elseif(${MONERO_FLAVOR} STREQUAL "zano")
- set(WALLET_TARGETS wallet ${wallet_LIB_DEPENDS})
+ find_package(Boost 1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options)
+ find_package(OpenSSL REQUIRED)
+ set(WALLET_TARGETS
+ wallet
+ general
+ tor-connect
+ crypto
+ currency_core
+ common
+ zlibstatic
+
+ ${Boost_LIBRARIES}
+ ${OpenSSL_LIBRARIES})
endif()
if(${MONERO_FLAVOR} STREQUAL "wownero")
@@ -125,7 +137,7 @@ endif()
#foreach (_variableName ${_variableNames})
# message(STATUS "${_variableName}=${${_variableName}}")
#endforeach()
-#message(SEND_ERROR noooo)
+# message(SEND_ERROR "${Boost_LIBRARIES}")
target_link_libraries( wallet2_api_c
diff --git a/monero_libwallet2_api_c/src/main/cpp/helpers.hpp b/monero_libwallet2_api_c/src/main/cpp/helpers.hpp
index 2c64394..83cf33b 100644
--- a/monero_libwallet2_api_c/src/main/cpp/helpers.hpp
+++ b/monero_libwallet2_api_c/src/main/cpp/helpers.hpp
@@ -3,6 +3,7 @@
#include <set>
#include <sstream>
#include <cstdlib>
+#include <iostream>
// Debug macros
#define DEBUG_START() \
diff --git a/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp b/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
index 95e666b..11acc0a 100644
--- a/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
+++ b/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
@@ -4,6 +4,7 @@
#include <cstring>
#include <thread>
#include "zano_checksum.h"
+#include "helpers.hpp"
#include "../../../../zano/src/wallet/plain_wallet_api.h"
#ifdef __cplusplus
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 81de083..7f8d845 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,6 @@
#ifndef MONEROC_CHECKSUMS
#define MONEROC_CHECKSUMS
const char * ZANO_wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd";
-const char * ZANO_wallet2_api_c_cpp_sha256 = "94c3f49fe8a8acd9693c08712b9c38ecdb3f1bfed0a22b6c3462228ed64b82ba-2817090c8ac7639d6f697d00fc8bcba2b3681d90";
+const char * ZANO_wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-2817090c8ac7639d6f697d00fc8bcba2b3681d90";
const char * ZANO_wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2";
#endif