diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-22 11:14:02 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-22 11:14:02 -0700 |
| commit | 4a17e3e6b947d6ede40e49f77244d880240240cd (patch) | |
| tree | b823cda6acfb2b12f4538e7726800027c8137923 /bitcoin-qt.pro | |
| parent | 958fe01c327a5a758b432d768685e77304b737bc (diff) | |
| parent | 49e1501b5dbccdea03561684cc5aeccfac4e5e5a (diff) | |
Merge pull request #946 from luke-jr/bugfix_rm_mingw
Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
Diffstat (limited to 'bitcoin-qt.pro')
| -rw-r--r-- | bitcoin-qt.pro | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index e040dadf6f..d9206b3bff 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -293,10 +293,21 @@ isEmpty(BOOST_INCLUDE_PATH) { macx:BOOST_INCLUDE_PATH = /opt/local/include } -windows:LIBS += -lmingwthrd -lws2_32 -lshlwapi -windows:DEFINES += _MT WIN32 +windows:LIBS += -lws2_32 -lshlwapi +windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc +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 +} + !windows:!mac { DEFINES += LINUX LIBS += -lrt |