diff --git a/res/libsodium/buildlibsodium.sh b/res/libsodium/buildlibsodium.sh index 6c59382..19ff89c 100755 --- a/res/libsodium/buildlibsodium.sh +++ b/res/libsodium/buildlibsodium.sh @@ -24,7 +24,7 @@ make clean if [[ "$OSTYPE" == "darwin"* ]]; then make CFLAGS="-mmacosx-version-min=10.11" CPPFLAGS="-mmacosx-version-min=10.11" -j4 else - make -j4 + make -j8 fi cd .. diff --git a/zecwallet-lite.pro b/zecwallet-lite.pro index f5af43c..93db31d 100644 --- a/zecwallet-lite.pro +++ b/zecwallet-lite.pro @@ -139,6 +139,10 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target + +libsodium.target = $$PWD/res/libsodium.a +libsodium.commands = res/libsodium/buildlibsodium.sh + unix: librust.target = $$PWD/lib/target/release/libzecwalletlite.a else:win32: librust.target = $$PWD/lib/target/x86_64-pc-windows-gnu/release/zecwalletlite.lib @@ -149,15 +153,15 @@ librustclean.commands = "rm -rf $$PWD/lib/target" distclean.depends += librustclean -QMAKE_EXTRA_TARGETS += librust librustclean distclean -QMAKE_CLEAN += $$PWD/lib/target/release/libzecwalletlite.a +QMAKE_EXTRA_TARGETS += librust libsodium librustclean distclean +QMAKE_CLEAN += $$PWD/lib/target/release/libzecwalletlite.a res/libsodium.a -win32: LIBS += -L$$PWD/lib/target/x86_64-pc-windows-gnu/release -lzecwalletlite -else:macx: LIBS += -L$$PWD/lib/target/release -lzecwalletlite -framework Security -framework Foundation -else:unix: LIBS += -L$$PWD/lib/target/release -lzecwalletlite -ldl +win32: LIBS += -L$$PWD/lib/target/x86_64-pc-windows-gnu/release -lzecwalletlite -L$$PWD/res/ -llibsodium +else:macx: LIBS += -L$$PWD/lib/target/release -lzecwalletlite -framework Security -framework Foundation -L$$PWD/res/ -lsodium +else:unix: LIBS += -L$$PWD/lib/target/release -lzecwalletlite -ldl -L$$PWD/res/ -lsodium -win32: PRE_TARGETDEPS += $$PWD/lib/target/x86_64-pc-windows-gnu/release/zecwalletlite.lib -else:unix::PRE_TARGETDEPS += $$PWD/lib/target/release/libzecwalletlite.a +win32: PRE_TARGETDEPS += $$PWD/lib/target/x86_64-pc-windows-gnu/release/zecwalletlite.lib $$PWD/res/liblibsodium.a +else:unix::PRE_TARGETDEPS += $$PWD/lib/target/release/libzecwalletlite.a $$PWD/res/libsodium.a INCLUDEPATH += $$PWD/res DEPENDPATH += $$PWD/res