fixes for mac build
authormark <mark@shotgunsoftware.com>
Mon, 20 Jun 2011 11:30:54 +0000 (07:30 -0400)
committermark <mark@shotgunsoftware.com>
Mon, 20 Jun 2011 11:30:54 +0000 (07:30 -0400)
bitcoin-qt.pro
src/db.cpp
src/init.cpp
src/main.cpp
src/util.cpp

index f329955..2770359 100644 (file)
@@ -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
index b67e2a6..a7fb4bd 100644 (file)
@@ -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;
index 013fb6b..f306185 100644 (file)
@@ -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>
 
index 61426a3..2dbbd67 100644 (file)
@@ -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;
index 2c1efc4..688605e 100644 (file)
@@ -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>