From f2057a23630901a76a12bf876a6f9a28d7fc52fd Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 1 Apr 2024 06:54:50 +0200 Subject: fix: wownero and monero wallets in the same process ci: cache ~/.ccache directory --- monero_libwallet2_api_c/CMakeLists.txt | 6 ++++++ monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'monero_libwallet2_api_c') diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index b222f9a..175cc9e 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -21,6 +21,9 @@ add_library( wallet2_api_c src/main/cpp/helpers.cpp src/main/cpp/wallet2_api_c.cpp ) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + set(MONERO_DIR ${CMAKE_SOURCE_DIR}/../${MONERO_FLAVOR}) set(EXTERNAL_LIBS_DIR ${MONERO_DIR}/contrib/depends/${HOST_ABI}) @@ -295,6 +298,9 @@ elseif(${MONERO_FLAVOR} STREQUAL "wownero") target_compile_definitions(wallet2_api_c PRIVATE FLAVOR_WOWNERO) endif() +if(NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin11") + set_target_properties(wallet2_api_c PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL") +endif() target_link_libraries( wallet2_api_c wallet_api diff --git a/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h b/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h index 22fd8d5..c995b24 100644 --- a/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h +++ b/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h @@ -19,7 +19,7 @@ extern "C" #ifdef __MINGW32__ #define ADDAPI __declspec(dllexport) #else - #define ADDAPI + #define ADDAPI __attribute__((__visibility__("default"))) #endif // namespace Monero { -- cgit v1.2.3