Merge pull request #1847 from gavinandresen/osx_pthread
Compile/link Bitcoin-Qt.app with -pthread on OSX
This commit is contained in:
commit
dc2a68dc43
@ -4,6 +4,7 @@ VERSION = 0.7.0
|
|||||||
INCLUDEPATH += src src/json src/qt
|
INCLUDEPATH += src src/json src/qt
|
||||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
|
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
|
||||||
CONFIG += no_include_pwd
|
CONFIG += no_include_pwd
|
||||||
|
CONFIG += thread
|
||||||
|
|
||||||
# for boost 1.37, add -mt to the boost libraries
|
# for boost 1.37, add -mt to the boost libraries
|
||||||
# use: qmake BOOST_LIB_SUFFIX=-mt
|
# 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:DEFINES += MAC_OSX MSG_NOSIGNAL=0
|
||||||
macx:ICON = src/qt/res/icons/bitcoin.icns
|
macx:ICON = src/qt/res/icons/bitcoin.icns
|
||||||
macx:TARGET = "Bitcoin-Qt"
|
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
|
# 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
|
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
|
||||||
|
Loading…
Reference in New Issue
Block a user