changes due updates in bitmonero

This commit is contained in:
Ilya Kitaev 2016-09-01 23:22:06 +03:00
parent 497a6b8de3
commit db965e1265
2 changed files with 2 additions and 3 deletions

View file

@ -2,7 +2,7 @@
BITMONERO_URL=https://github.com/mbg033/bitmonero.git BITMONERO_URL=https://github.com/mbg033/bitmonero.git
BITMONERO_BRANCH=develop BITMONERO_BRANCH=master
# thanks to SO: http://stackoverflow.com/a/20283965/4118915 # thanks to SO: http://stackoverflow.com/a/20283965/4118915
CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu) CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
pushd $(pwd) pushd $(pwd)

View file

@ -45,8 +45,7 @@ SOURCES = *.qml \
} }
LIBS += -L$$WALLET_ROOT/lib \ LIBS += -L$$WALLET_ROOT/lib \
-lwallet_merged \ -lwallet_merged
-lwallet_merged2
win32 { win32 {
#QMAKE_LFLAGS += -static #QMAKE_LFLAGS += -static