add zxcvbn to the qmake build system

This commit is contained in:
moneromooo.monero 2016-12-15 23:47:53 +00:00
parent aae35df77d
commit b882de8e1c
3 changed files with 8 additions and 5 deletions

View file

@ -17,6 +17,9 @@ if [ ! -d $MONERO_DIR ]; then
$SHELL get_libwallet_api.sh $BUILD_TYPE
fi
# build zxcvbn
make -C src/zxcvbn-c
if [ ! -d build ]; then mkdir build; fi
if [ "$BUILD_TYPE" == "Release" ]; then
@ -27,7 +30,6 @@ else
BIN_PATH=debug/bin
fi
# Platform indepenent settings
platform=$(get_platform)
if [ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]; then

View file

@ -34,7 +34,8 @@ HEADERS += \
src/QR-Code-generator/QrSegment.hpp \
src/daemon/DaemonManager.h \
src/model/AddressBookModel.h \
src/libwalletqt/AddressBook.h
src/libwalletqt/AddressBook.h \
src/zxcvbn-c/zxcvbn.h
SOURCES += main.cpp \
@ -56,7 +57,8 @@ SOURCES += main.cpp \
src/QR-Code-generator/QrSegment.cpp \
src/daemon/DaemonManager.cpp \
src/model/AddressBookModel.cpp \
src/libwalletqt/AddressBook.cpp
src/libwalletqt/AddressBook.cpp \
src/zxcvbn-c/zxcvbn.c
lupdate_only {
SOURCES = *.qml \
@ -236,7 +238,6 @@ QMAKE_EXTRA_COMPILERS += langrel
PRE_TARGETDEPS += langupd compiler_langrel_make_all
RESOURCES += qml.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model

View file

@ -30,7 +30,7 @@
*
**********************************************************************************/
#include <zxcvbn.h>
#include "zxcvbn.h"
#include <ctype.h>
#include <string.h>
#include <stdint.h>