From 2fb6b83fa8bd7c2b3de42f93e15079ab27ad1c6e Mon Sep 17 00:00:00 2001 From: cyan Date: Fri, 1 Nov 2024 11:00:52 +0000 Subject: fix: devcontainer on x64 ffigen: add zano zano: add missing free dart: implement zano --- monero_libwallet2_api_c/CMakeLists.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'monero_libwallet2_api_c') diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index 5e84d16..10c0db9 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -27,7 +27,7 @@ if (${HOST_ABI} STREQUAL "host-apple-darwin" OR endif() endif() -if(${HOST_ABI} STREQUAL "x86_64-linux-android" OR +if(${HOST_ABI} STREQUAL "" OR ${HOST_ABI} STREQUAL "i686-linux-android" OR ${HOST_ABI} STREQUAL "aarch64-linux-android" OR ${HOST_ABI} STREQUAL "armv7a-linux-androideabi") @@ -80,13 +80,17 @@ elseif(${HOST_ABI} STREQUAL "aarch64-linux-gnu") set(BOOST_WTF_DATE_TIME "-mt-s-a64") set(BOOST_WTF_PART "") elseif(${HOST_ABI} STREQUAL "x86_64-w64-mingw32" OR ${HOST_ABI} STREQUAL "i686-w64-mingw32") - set(BOOST_WTF "-mt-sa64") + set(BOOST_WTF "-mt-s") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "_win32") elseif(${HOST_ABI} STREQUAL "host-apple-ios") set(BOOST_WTF "") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") +elseif(${HOST_ABI} STREQUAL "x86_64-linux-gnu" AND ${MONERO_FLAVOR} STREQUAL "zano") + set(BOOST_WTF "-mt-x64") + set(BOOST_WTF_DATE_TIME "-mt-s-x64") + set(BOOST_WTF_PART "") else() set(BOOST_WTF "-mt") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") @@ -470,6 +474,9 @@ if (${MONERO_FLAVOR} STREQUAL "zano") ) else() set(API_IMPORTS + + ${EXTRA_LIBS} + wallet_api wallet cryptonote_core @@ -486,6 +493,7 @@ else() easylogging unbound crypto + ssl epee blocks checkpoints @@ -500,14 +508,13 @@ else() polyseed polyseed-wrapper utf8proc + ) endif() target_link_libraries( wallet2_api_c ${API_IMPORTS} - - ${EXTRA_LIBS} boost_chrono boost_locale -- cgit v1.2.3