Mercurial > hg > bitcoin
changeset 2841:3ab72be8ff71 draft
Merge branch '0.5.0.x' into 0.5.3.x
| author | Luke Dashjr <luke-jr+git@utopios.org> |
|---|---|
| date | Fri, 16 Mar 2012 17:28:22 -0400 |
| parents | ca8a99efaaef (current diff) 5e1078aa3847 (diff) |
| children | 33561daf5f21 |
| files | bitcoin-qt.pro |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -251,8 +251,8 @@ macx:BOOST_INCLUDE_PATH = /opt/local/include } -windows:LIBS += -lws2_32 -windows:DEFINES += WIN32 +windows:LIBS += -lmingwthrd -lws2_32 +windows:DEFINES += _MT WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc macx:HEADERS += src/qt/macdockiconhandler.h
--- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -47,6 +47,7 @@ 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