X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=bitcoin-qt.pro;h=60f1de89979dfea7d8ccab4c18e99d02edf2c37c;hp=d46a6e7df78e78245f56aad7190390f0bd2b99f2;hb=9a133240d307abc964409540dba337b133922f7f;hpb=166004aca586292458fd6dd2c676e20f70d1e65d

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index d46a6e7..60f1de8 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -204,7 +204,7 @@ CODECFORTR = UTF-8
 TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
 
 isEmpty(QMAKE_LRELEASE) {
-    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
 }
 isEmpty(TS_DIR):TS_DIR = src/qt/locale
@@ -251,10 +251,20 @@ isEmpty(BOOST_INCLUDE_PATH) {
     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