diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-20 08:17:31 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-20 08:17:31 -0700 |
| commit | 679592720af4bae337bcb2d2c0343a9352bbfefc (patch) | |
| tree | b0f5534131573630351169def0843d07d4e1fac9 | |
| parent | 0f9ee792d9831732c567cb8228aa229836dd139a (diff) | |
| parent | 3c7ebaedcd871d03033651b1ba3f4f2333e7d69b (diff) | |
Merge pull request #5 from mjmvisser/master
mac fixes
| -rw-r--r-- | bitcoin-qt.pro | 3 | ||||
| -rw-r--r-- | src/db.cpp | 1 | ||||
| -rw-r--r-- | src/init.cpp | 1 | ||||
| -rw-r--r-- | src/main.cpp | 1 | ||||
| -rw-r--r-- | src/util.cpp | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index f3299554d6..27703592eb 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -5,7 +5,8 @@ INCLUDEPATH += src src/json src/cryptopp src/qt # 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 -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 +macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 +macx:LIBS += -lboost_thread-mt # disable quite some warnings because bitcoin core "sins" a lot QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch diff --git a/src/db.cpp b/src/db.cpp index b67e2a6452..a7fb4bd6ea 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -5,6 +5,7 @@ #include "headers.h" #include "db.h" #include "net.h" +#include <boost/filesystem/operations.hpp> #include <boost/filesystem/fstream.hpp> using namespace std; diff --git a/src/init.cpp b/src/init.cpp index 013fb6bda2..f306185317 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -7,6 +7,7 @@ #include "net.h" #include "init.h" #include "strlcpy.h" +#include <boost/filesystem/operations.hpp> #include <boost/filesystem/fstream.hpp> #include <boost/interprocess/sync/file_lock.hpp> diff --git a/src/main.cpp b/src/main.cpp index 61426a3ef9..2dbbd674a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,6 +6,7 @@ #include "net.h" #include "init.h" #include "cryptopp/sha.h" +#include <boost/filesystem/operations.hpp> #include <boost/filesystem/fstream.hpp> using namespace std; diff --git a/src/util.cpp b/src/util.cpp index 2c1efc4042..688605ef5c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5,6 +5,7 @@ #include "strlcpy.h" #include <boost/program_options/detail/config_file.hpp> #include <boost/program_options/parsers.hpp> +#include <boost/filesystem/operations.hpp> #include <boost/filesystem/fstream.hpp> #include <boost/interprocess/sync/interprocess_mutex.hpp> #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp> |