From 627e3e68df8c94f91da72e6327b2636ffadbb75e Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Fri, 26 Apr 2024 00:44:11 +0200 Subject: [PATCH] fix build issues --- linux/CMakeLists.txt | 4 ++-- scripts/android/build_all.sh | 6 +++--- scripts/linux/build_all.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 53391e7ad..8fed408de 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -134,10 +134,10 @@ install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR} install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/linux/build/libcw_monero.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/x86_64-linux-gnu_libwallet2_api_c.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "monero_libwallet2_api_c.so" COMPONENT Runtime) -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/linux/build/libcw_wownero.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-linux-gnu_libwallet2_api_c.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "wownero_libwallet2_api_c.so" COMPONENT Runtime) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libepiccash/scripts/linux/build/rust/target/x86_64-unknown-linux-gnu/release/libepic_cash_wallet.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index 3f499e3f9..13438cf7d 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -10,9 +10,9 @@ mkdir -p build . ./config.sh ./install_ndk.sh -(cd ../../crypto_plugins/flutter_liblelantus/scripts/android && ./build_all.sh ) & -(cd ../../crypto_plugins/flutter_libepiccash/scripts/android && ./install_ndk.sh && ./build_opensll.sh && ./build_all.sh ) & -(cd ../../crypto_plugins/flutter_libmonero/scripts/android/ && ./build_all.sh ) & +(cd ../../crypto_plugins/flutter_liblelantus/scripts/android && ./build_all.sh ) +(cd ../../crypto_plugins/flutter_libepiccash/scripts/android && ./install_ndk.sh && ./build_openssl.sh && ./build_all.sh ) +(cd ../../crypto_plugins/flutter_libmonero/scripts/android/ && ./build_all.sh ) wait echo "Done building" diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index 672668c13..408a2c6b4 100755 --- a/scripts/linux/build_all.sh +++ b/scripts/linux/build_all.sh @@ -11,10 +11,10 @@ set_rust_to_1671 # flutter-elinux pub get # flutter-elinux build linux --dart-define="IS_ARM=true" mkdir -p build -./build_secure_storage_deps.sh & -(cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) & -(cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) & -(cd ../../crypto_plugins/flutter_libmonero/scripts/linux && ./build_monero_all.sh && ./build_sharedfile.sh ) & +./build_secure_storage_deps.sh +(cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) +(cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) +(cd ../../crypto_plugins/flutter_libmonero/scripts/linux && ./build_all.sh ) wait echo "Done building"