Mercurial > hg > bitcoin
changeset 2845:368b07d6e4e9 draft
Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.
Use `qmake MINGW_THREAD_BUGFIX=0` to disable
| author | Luke Dashjr <luke-jr+git@utopios.org> |
|---|---|
| date | Sat, 17 Mar 2012 19:54:22 -0400 |
| parents | 8a903925ff38 |
| children | cd483ad3a9b3 |
| files | bitcoin-qt.pro |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -251,10 +251,20 @@ macx:BOOST_INCLUDE_PATH = /opt/local/include } -windows:LIBS += -lmingwthrd -lws2_32 -windows:DEFINES += _MT WIN32 +windows:LIBS += -lws2_32 +windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc -windows:QMAKE_LIBS_QT_ENTRY -= -lmingw32 + +windows:!contains(MINGW_THREAD_BUGFIX, 0) { + # At least qmake's win32-g++-cross profile is missing the -lmingwthrd + # thread-safety flag. GCC has -mthreads to enable this, but it doesn't + # work with static linking. -lmingwthrd must come BEFORE -lmingw, so + # it is prepended to QMAKE_LIBS_QT_ENTRY. + # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes + # any problems on some untested qmake profile now or in the future. + DEFINES += _MT + QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY +} macx:HEADERS += src/qt/macdockiconhandler.h macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm