aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-09-25 02:52:34 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-09-25 02:52:34 -0700
commitdc2a68dc43e92ade20906ddff157f2591f07eef8 (patch)
treea53884d0075a84f37f90f0ec380abf141a4af0eb
parent6a34def27e7baa7fda32acef76414e000c36d251 (diff)
parentd6c4400d57c6d6eaba7ef23ba24371069ec037e5 (diff)
Merge pull request #1847 from gavinandresen/osx_pthread
Compile/link Bitcoin-Qt.app with -pthread on OSX
-rw-r--r--bitcoin-qt.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index c6ddc98ff4..26044f0f04 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -4,6 +4,7 @@ VERSION = 0.7.0
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
+CONFIG += thread
# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
@@ -347,6 +348,9 @@ macx:LIBS += -framework Foundation -framework ApplicationServices -framework App
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:TARGET = "Bitcoin-Qt"
+macx:QMAKE_CFLAGS_THREAD += -pthread
+macx:QMAKE_LFLAGS_THREAD += -pthread
+macx:QMAKE_CXXFLAGS_THREAD += -pthread
# Set libraries and includes at end, to use platform-defined defaults if not overridden
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH