From 0c086a6fcd51476a57156a008d6f485b2d2db7aa Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 25 Aug 2013 18:03:23 +0400 Subject: [PATCH] Small and simple hack to override compiler warning --- novacoin-qt.pro | 13 ++++++++----- src/rpcmining.cpp | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 6604ac3..9a0f43f 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -96,24 +96,27 @@ contains(USE_LEVELDB, -) { } else { message(Building with LevelDB) DEFINES += USE_LEVELDB + INCLUDEPATH += src/leveldb/include src/leveldb/helpers LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a SOURCES += src/txdb-leveldb.cpp - !windows { - genleveldb.commands = cd $$PWD/src/leveldb ; make libleveldb.a libmemenv.a + !win32 { + # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a } else { # make an educated guess about what the ranlib command is called isEmpty(QMAKE_RANLIB) { QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) } - genleveldb.commands = cd $$PWD/src/leveldb ; CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$$BOOST_INCLUDE_PATH" LDFLAGS="-L$$BOOST_LIB_PATH" make libleveldb.a libmemenv.a ; $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a + LIBS += -lshlwapi + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a } genleveldb.target = $$PWD/src/leveldb/libleveldb.a genleveldb.depends = FORCE PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a QMAKE_EXTRA_TARGETS += genleveldb - # Gross ugly hack that depends on qmake internals, unfortunately there's no other way to do it. - QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; make clean + # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it. + QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean } # regenerate src/build.h diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index e621986..57a413b 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -48,7 +48,7 @@ Value getmininginfo(const Array& params, bool fHelp) { if (pindex->IsProofOfStake()) { - dStakeKernelsTriedAvg += GetDifficulty(pindex) * 4294967296; + dStakeKernelsTriedAvg += GetDifficulty(pindex) * 4294967296.0; nStakesTime += pindexPrevStake ? (pindexPrevStake->nTime - pindex->nTime) : 0; pindexPrevStake = pindex; nStakesHandled++; -- 1.7.1