diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:17:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:17:43 +0000 |
| commit | 4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d (patch) | |
| tree | cf8d0b8d7abef0be531d4788b0653b1286136971 /bitcoin-qt.pro | |
| parent | 638cecee77dba4bcffb225627f63658b247709ea (diff) | |
| parent | cef36fad891fba0fd8f5aec73bb17135b7fb133a (diff) | |
| download | bitcoin-4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/transactiondesc.cpp
Diffstat (limited to 'bitcoin-qt.pro')
| -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 59f7a4718c..4e09583c7e 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -4,6 +4,7 @@ VERSION = 0.6.0.10 INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI BOOST_THREAD_USE_LIB CONFIG += no_include_pwd +CONFIG += thread # for boost 1.37, add -mt to the boost libraries # use: qmake BOOST_LIB_SUFFIX=-mt @@ -317,6 +318,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 |