Merge pull request #2403

ae2fdc7 build: build, install and link against randomx library (xiphon)
This commit is contained in:
luigi1111 2019-09-30 18:59:26 -05:00
commit 5ecca50977
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 17 additions and 19 deletions

View file

@ -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

View file

@ -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 \