From ae2fdc7ab3d959c085f551b05d1c274d8ecb9543 Mon Sep 17 00:00:00 2001 From: xiphon Date: Sat, 28 Sep 2019 12:14:07 +0000 Subject: [PATCH] build: build, install and link against randomx library --- get_libwallet_api.sh | 3 +++ monero-wallet-gui.pro | 33 ++++++++++++++------------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 7ee7f81e..09b05c3b 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -253,4 +253,7 @@ if [ -d $MONERO_DIR/build/$BUILD_TYPE/external/unbound ]; then popd fi +# install randomx +eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/randomx all install + popd diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 9986a337..1d58ce98 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -142,25 +142,25 @@ ios:arm64 { LIBS += \ -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/arm64 \ } + +LIBS_COMMON = \ + -lwallet_merged \ + -llmdb \ + -lepee \ + -lunbound \ + -lsodium \ + -leasylogging \ + -lrandomx + !ios:!android { -LIBS += -L$$WALLET_ROOT/lib \ - -lwallet_merged \ - -llmdb \ - -lepee \ - -lunbound \ - -lsodium \ - -leasylogging + LIBS += -L$$WALLET_ROOT/lib \ + $$LIBS_COMMON } android { message("Host is Android") LIBS += -L$$WALLET_ROOT/lib \ - -lwallet_merged \ - -llmdb \ - -lepee \ - -lunbound \ - -lsodium \ - -leasylogging + $$LIBS_COMMON } @@ -175,12 +175,7 @@ ios { QMAKE_IOS_DEVICE_ARCHS = arm64 CONFIG += arm64 LIBS += -L$$WALLET_ROOT/lib-ios \ - -lwallet_merged \ - -llmdb \ - -lepee \ - -lunbound \ - -lsodium \ - -leasylogging + $$LIBS_COMMON LIBS+= \ -L$$PWD/../OpenSSL-for-iPhone/lib \