Merged mining patch

bitcoin-qt.pro

@@ -7,6 +7,8 @@ QT += network
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd
 CONFIG += thread
+#Added
+CONFIG += static 
 
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt
@@ -17,6 +19,27 @@ CONFIG += thread
 # Dependency library locations can be customized with:
 #    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
 #    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
+BOOST_LIB_SUFFIX=-mgw49-mt-s-1_55
+BOOST_INCLUDE_PATH=C:/MinGW/dev/boost_1_55_0
+BOOST_LIB_PATH=C:/MinGW/dev/boost_1_55_0/stage/lib
+BDB_INCLUDE_PATH=C:/MinGW/dev/db-4.8.30.NC/build_unix
+BDB_LIB_PATH=C:/MinGW/dev/db-4.8.30.NC/build_unix
+OPENSSL_INCLUDE_PATH=C:/MinGW/dev/openssl-1.0.1i/include
+OPENSSL_LIB_PATH=C:/MinGW/dev/openssl-1.0.1i
+MINIUPNPC_INCLUDE_PATH=C:/MinGW/dev
+MINIUPNPC_LIB_PATH=C:/MinGW/dev/miniupnpc
+QRENCODE_INCLUDE_PATH=C:/MinGW/dev/qrencode-3.4.3
+QRENCODE_LIB_PATH=C:/MinGW/dev/qrencode-3.4.3/.libs
+
+MPFR_INCLUDE_PATH=C:/MinGW/dev/mpfr-3.1.2/src
+MPFR_LIB_PATH=C:/MinGW/dev/mpfr-3.1.2/src/.libs
+INCLUDEPATH += $$MPFR_INCLUDE_PATH
+QMAKE_LIBDIR += $$MPFR_LIB_PATH
+
+GMP_INCLUDE_PATH=C:/mingw/dev/gmp-5.0.2
+GMP_LIB_PATH=C:/mingw/dev/gmp-5.0.2/.libs
+INCLUDEPATH += $$GMP_INCLUDE_PATH
+QMAKE_LIBDIR += $$GMP_LIB_PATH
 
 OBJECTS_DIR = build
 MOC_DIR = build
@@ -47,7 +70,7 @@ QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
 # for extra security on Windows: enable ASLR and DEP via GCC linker flags
 win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
 # on Windows: enable GCC large address aware linker flag
-win32:QMAKE_LFLAGS *= -Wl,--large-address-aware
+win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
 
 # use: qmake "USE_QRCODE=1"
 # libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
@@ -109,7 +132,7 @@ LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
         QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
     }
     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.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
@@ -215,7 +238,8 @@ HEADERS += src/qt/bitcoingui.h \
     src/leveldb.h \
     src/threadsafety.h \
     src/limitedmap.h \
-    src/qt/splashscreen.h
+    src/qt/splashscreen.h \
+	src/auxpow.h
 
 SOURCES += src/qt/bitcoin.cpp \
     src/qt/bitcoingui.cpp \
@@ -283,7 +307,8 @@ SOURCES += src/qt/bitcoin.cpp \
     src/noui.cpp \
     src/leveldb.cpp \
     src/txdb.cpp \
-    src/qt/splashscreen.cpp
+    src/qt/splashscreen.cpp \
+	src/auxpow.cpp
 
 RESOURCES += src/qt/bitcoin.qrc