From 2af40a501351d2304182f542b072639e2e9a8287 Mon Sep 17 00:00:00 2001 From: Celil Date: Sun, 24 Jul 2011 14:45:51 -0700 Subject: [PATCH 1/2] On Mac OS X do not link aginst the boost libraries in UNIX:LIBS --- bitcoin-qt.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index f1bc8e7fd24..e0025472f80 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -6,9 +6,10 @@ DEFINES += QT_GUI CONFIG += no_include_pwd # for boost 1.37, add -mt to the boost libraries -unix:LIBS += -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx +unix:LIBS += -lssl -lcrypto -ldb_cxx +unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 -macx:LIBS += -lboost_thread-mt -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt +macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt windows:DEFINES += __WXMSW__ windows:LIBS += -lssl -lcrypto -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -ldb_cxx -lws2_32 -lgdi32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc From a8c50c06e315007941689d3297919622bc93053b Mon Sep 17 00:00:00 2001 From: celil-kj Date: Sun, 24 Jul 2011 14:54:40 -0700 Subject: [PATCH 2/2] Clean up the project file. --- bitcoin-qt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index e0025472f80..feb64533c0b 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -6,12 +6,12 @@ DEFINES += QT_GUI CONFIG += no_include_pwd # for boost 1.37, add -mt to the boost libraries -unix:LIBS += -lssl -lcrypto -ldb_cxx +LIBS += -lssl -lcrypto -ldb_cxx unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt +macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 +windows:LIBS += -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -lws2_32 -lgdi32 windows:DEFINES += __WXMSW__ -windows:LIBS += -lssl -lcrypto -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -ldb_cxx -lws2_32 -lgdi32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc # for extra security against potential buffer overflows