DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix libsodium

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-15 11:24:58 -07:00
parent c04685f79a
commit 18609491c7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/libsodium/buildlibsodium.sh
View File

@@ -24,7 +24,7 @@ make clean
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
make CFLAGS="-mmacosx-version-min=10.11" CPPFLAGS="-mmacosx-version-min=10.11" -j4 make CFLAGS="-mmacosx-version-min=10.11" CPPFLAGS="-mmacosx-version-min=10.11" -j4
else else
make -j4 make -j8
fi fi
cd .. cd ..

18
zecwallet-lite.pro
View File

@@ -139,6 +139,10 @@ qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target !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 unix: librust.target = $$PWD/lib/target/release/libzecwalletlite.a
else:win32: librust.target = $$PWD/lib/target/x86_64-pc-windows-gnu/release/zecwalletlite.lib 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 distclean.depends += librustclean
QMAKE_EXTRA_TARGETS += librust librustclean distclean QMAKE_EXTRA_TARGETS += librust libsodium librustclean distclean
QMAKE_CLEAN += $$PWD/lib/target/release/libzecwalletlite.a QMAKE_CLEAN += $$PWD/lib/target/release/libzecwalletlite.a res/libsodium.a
win32: LIBS += -L$$PWD/lib/target/x86_64-pc-windows-gnu/release -lzecwalletlite 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 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 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 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 else:unix::PRE_TARGETDEPS += $$PWD/lib/target/release/libzecwalletlite.a $$PWD/res/libsodium.a
INCLUDEPATH += $$PWD/res INCLUDEPATH += $$PWD/res
DEPENDPATH += $$PWD/res DEPENDPATH += $$PWD/res