From 0e569e4a27f42e9a0dea75a3f47cb1091ba30d02 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 6 Oct 2011 17:02:21 -0400 Subject: [PATCH] Add option to specify a different suffix for boost_thread. --- bitcoin-qt.pro | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index abb7cefc..1929122d 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -7,6 +7,8 @@ CONFIG += no_include_pwd # for boost 1.37, add -mt to the boost libraries # use: qmake BOOST_LIB_SUFFIX=-mt +# for boost thread win32 with _win32 sufix +# use: BOOST_THREAD_LIB_SUFFIX=_win32-... # or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8 # Dependency library locations can be customized with BOOST_INCLUDE_PATH, @@ -202,6 +204,10 @@ isEmpty(BOOST_LIB_SUFFIX) { windows:BOOST_LIB_SUFFIX = -mgw44-mt-1_43 } +isEmpty(BOOST_THREAD_LIB_SUFFIX) { + BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX +} + isEmpty(BDB_LIB_PATH) { macx:BDB_LIB_PATH = /opt/local/lib/db48 } @@ -237,6 +243,6 @@ macx:TARGET = "Bitcoin-Qt" INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX -LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_LIB_SUFFIX +LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)