From 4433193415187b2aa3d14097f3dc9bf13cd9a969 Mon Sep 17 00:00:00 2001 From: cyan Date: Fri, 28 Jun 2024 13:43:14 +0000 Subject: try to use ANDROID_STL=c++_static --- monero_libwallet2_api_c/CMakeLists.txt | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'monero_libwallet2_api_c') diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index 27a9d05..47986b2 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -334,22 +334,6 @@ elseif(${HOST_ABI} STREQUAL "host-apple-ios") set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" iconv ) endif() -if (${HOST_ABI} STREQUAL "x86_64-linux-android" OR - ${HOST_ABI} STREQUAL "i686-linux-android" OR - ${HOST_ABI} STREQUAL "aarch64-linux-android") - add_library(libcppstatic STATIC IMPORTED) - set_target_properties(libcppstatic PROPERTIES IMPORTED_LOCATION - ${MONERO_DIR}/contrib/depends/${HOST_ABI}/native/sysroot/usr/lib/${HOST_ABI}/libc++_static.a) - add_link_options(wallet2_api_c PRIVATE -static-libstdc++) - set(EXTRA_LIBS_ANDROID libcppstatic) -elseif(${HOST_ABI} STREQUAL "armv7a-linux-androideabi") - add_library(libcppstatic STATIC IMPORTED) - set_target_properties(libcppstatic PROPERTIES IMPORTED_LOCATION - ${MONERO_DIR}/contrib/depends/${HOST_ABI}/native/sysroot/usr/lib/arm-linux-androideabi/libc++_static.a) - add_link_options(wallet2_api_c PRIVATE -static-libstdc++) -endif() - - if(${HOST_ABI} STREQUAL "x86_64-w64-mingw32" OR ${HOST_ABI} STREQUAL "i686-w64-mingw32") set_target_properties(wallet2_api_c PROPERTIES SUFFIX ".dll") set(EXTRA_LIBS_WINDOWS ssp wsock32 ws2_32 iconv-win iphlpapi crypt32 hidapi) -- cgit v1.2.3