Browse Source

Merge pull request #5 from mjmvisser/master

mac fixes
0.8
Wladimir J. van der Laan 14 years ago
parent
commit
679592720a
  1. 3
      bitcoin-qt.pro
  2. 1
      src/db.cpp
  3. 1
      src/init.cpp
  4. 1
      src/main.cpp
  5. 1
      src/util.cpp

3
bitcoin-qt.pro

@ -5,7 +5,8 @@ INCLUDEPATH += src src/json src/cryptopp src/qt @@ -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

1
src/db.cpp

@ -5,6 +5,7 @@ @@ -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;

1
src/init.cpp

@ -7,6 +7,7 @@ @@ -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>

1
src/main.cpp

@ -6,6 +6,7 @@ @@ -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;

1
src/util.cpp

@ -5,6 +5,7 @@ @@ -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>

Loading…
Cancel
Save