diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-09-30 18:59:26 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-09-30 18:59:26 -0500 |
| commit | 5ecca509779faa75ca8f76ea8e73330dfab48704 (patch) | |
| tree | 3b9c68e9ce9361e60b70de37327750323ab43d3d | |
| parent | d3b81cb6f8b9e79bc8bda675f556d5288916af56 (diff) | |
| parent | ae2fdc7ab3d959c085f551b05d1c274d8ecb9543 (diff) | |
| download | monzero-gui-5ecca509779faa75ca8f76ea8e73330dfab48704.tar.gz monzero-gui-5ecca509779faa75ca8f76ea8e73330dfab48704.tar.xz monzero-gui-5ecca509779faa75ca8f76ea8e73330dfab48704.zip | |
Merge pull request #2403
ae2fdc7 build: build, install and link against randomx library (xiphon)
| -rwxr-xr-x | get_libwallet_api.sh | 3 | ||||
| -rw-r--r-- | 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 \ |