X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=bitcoin-qt.pro;h=d9206b3bfff078ae9a89c098ce1bc3dac76c4995;hb=4a17e3e6b947d6ede40e49f77244d880240240cd;hp=e040dadf6f1fa56eb197a35d59a907d754e82f4d;hpb=958fe01c327a5a758b432d768685e77304b737bc;p=novacoin.git

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index e040dad..d9206b3 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