From: Matt Corallo <matt@bluematt.me>
Date: Fri, 16 Mar 2012 02:55:12 +0000 (-0400)
Subject: Fix Win32 RPC Crashes.
X-Git-Tag: v0.4.0-unstable~129^2~158^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=8864019f6d88b13d3442843d9e6ebeb8dd938831

Fix Win32 RPC Crashes.
---

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index e757310..9fb92af 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -291,8 +291,8 @@ isEmpty(BOOST_INCLUDE_PATH) {
     macx:BOOST_INCLUDE_PATH = /opt/local/include
 }
 
-windows:LIBS += -lws2_32 -lshlwapi
-windows:DEFINES += WIN32
+windows:LIBS += -lmingwthrd -lws2_32 -lshlwapi
+windows:DEFINES += _MT WIN32
 windows:RC_FILE = src/qt/res/bitcoin-qt.rc
 
 !windows:!mac {
diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml
index 6eb76b2..adccebb 100644
--- a/contrib/gitian-descriptors/qt-win32.yml
+++ b/contrib/gitian-descriptors/qt-win32.yml
@@ -47,6 +47,7 @@ script: |
   cp -a bin $SRCDIR/
   cd $INSTDIR
   find . -name *.prl | xargs -l sed 's|/$||' -i
+  sed 's/QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain/QMAKE_LIBS_QT_ENTRY     = -lqtmain/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
   #sed 's|QMAKE_PRL_LIBS.*|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl
 
   # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date