diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-09-25 02:52:34 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-09-25 02:52:34 -0700 |
| commit | dc2a68dc43e92ade20906ddff157f2591f07eef8 (patch) | |
| tree | a53884d0075a84f37f90f0ec380abf141a4af0eb | |
| parent | Merge pull request #1856 from Diapolo/stack-protector_nonWindows (diff) | |
| parent | Compile/link Bitcoin-Qt.app with -pthread (diff) | |
| download | discoin-dc2a68dc43e92ade20906ddff157f2591f07eef8.tar.xz discoin-dc2a68dc43e92ade20906ddff157f2591f07eef8.zip | |
Merge pull request #1847 from gavinandresen/osx_pthread
Compile/link Bitcoin-Qt.app with -pthread on OSX
| -rw-r--r-- | bitcoin-qt.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index c6ddc98ff..26044f0f0 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 |