diff options
| author | Gregory Maxwell <gmaxwell@gmail.com> | 2012-03-16 11:32:53 -0700 |
|---|---|---|
| committer | Gregory Maxwell <gmaxwell@gmail.com> | 2012-03-16 11:32:53 -0700 |
| commit | fa689db37b0d1abeefde9ab4760ffa502217da7f (patch) | |
| tree | 601c6aeec6251ac78f176ea4570e50f11aa17f16 | |
| parent | 98ff031eb8d35cbdcfb89308b35834f13f45d642 (diff) | |
| parent | 8864019f6d88b13d3442843d9e6ebeb8dd938831 (diff) | |
Merge pull request #938 from TheBlueMatt/guirpcwin32
Disable running with -server on bitcoin-qt.exe as it is broken.
| -rw-r--r-- | bitcoin-qt.pro | 4 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index e757310a3d..9fb92afd09 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 6eb76b2170..adccebbb91 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 |