diff --git a/etc/scripts/build-external-libs/wownero/build.sh b/etc/scripts/build-external-libs/wownero/build.sh index 94c0dd5..fe78d7c 100755 --- a/etc/scripts/build-external-libs/wownero/build.sh +++ b/etc/scripts/build-external-libs/wownero/build.sh @@ -72,13 +72,30 @@ for arch in ${archs[@]}; do export TOOLCHAIN_DIR=`realpath $build_root_wow/tool/${arch}` export PATH=$PATH:$build_root/host/bin + mkdir -p build/release + pushd . + cd build/release ( CMAKE_INCLUDE_PATH="${PREFIX}/include" \ - CMAKE_LIBRARY_PATH="${PREFIX}/lib" \ - ANDROID_STANDALONE_TOOLCHAIN_PATH=${TOOLCHAIN_DIR} \ - USE_SINGLE_BUILDDIR=1 \ - make release-static-android-armv8 -j${NPROC} \ + CMAKE_LIBRARY_PATH="${PREFIX}/lib" \ + CC=aarch64-linux-android-clang \ + CXX=aarch64-linux-android-clang++ \ + cmake \ + -D BUILD_TESTS=OFF \ + -D ARCH="armv8-a" \ + -D STATIC=ON \ + -D BUILD_64=ON \ + -D CMAKE_BUILD_TYPE=release \ + -D ANDROID=true \ + -D INSTALL_VENDORED_LIBUNBOUND=ON \ + -D BUILD_TAG="android-armv8" \ + -D CMAKE_SYSTEM_NAME="Android" \ + -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${TOOLCHAIN_DIR}" \ + -D CMAKE_ANDROID_ARCH_ABI="arm64-v8a" \ + -D MANUAL_SUBMODULES=ON \ + ../.. && make -j${NPROC} ) + popd done diff --git a/etc/scripts/build-external-libs/wownero/fetch.sh b/etc/scripts/build-external-libs/wownero/fetch.sh index dd0edbc..8eed544 100755 --- a/etc/scripts/build-external-libs/wownero/fetch.sh +++ b/etc/scripts/build-external-libs/wownero/fetch.sh @@ -46,4 +46,7 @@ git clone --depth 1 https://github.com/wownero/wownero.git -b $version cd $name test `git rev-parse HEAD` = $githash || exit 1 -git submodule init && git submodule update +git submodule update --init external/unbound +git submodule update --init external/miniupnp +git submodule update --init external/rapidjson +git submodule update --init external/RandomWOW