diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-09 18:19:29 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-09 18:19:29 -0700 |
| commit | dc4cf7c183946e6aa190b94d5c06fd43b1703f6e (patch) | |
| tree | 0c832c7b98bd535a2e478b7fff2d3651d13513e3 | |
| parent | 8c6bbb3a86aeb317c38b23611a9d31ffaf5641e1 (diff) | |
| parent | 4332be71a2b15315ddc299e2f3695054df30eb95 (diff) | |
| download | bitcoin-dc4cf7c183946e6aa190b94d5c06fd43b1703f6e.tar.xz | |
Merge pull request #2635 from gavinandresen/boost_chrono_osx
Link with boost_chrono library on OSX
| -rw-r--r-- | bitcoin-qt.pro | 1 | ||||
| -rw-r--r-- | src/makefile.osx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index d938c07c45..07eadb5db9 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -411,6 +411,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX +macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX contains(RELEASE, 1) { !win32:!macx { diff --git a/src/makefile.osx b/src/makefile.osx index af12731fa4..50279fdb05 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -36,6 +36,7 @@ LIBS += \ $(DEPSDIR)/lib/libboost_filesystem-mt.a \ $(DEPSDIR)/lib/libboost_program_options-mt.a \ $(DEPSDIR)/lib/libboost_thread-mt.a \ + $(DEPSDIR)/lib/libboost_chrono-mt.a \ $(DEPSDIR)/lib/libssl.a \ $(DEPSDIR)/lib/libcrypto.a \ -lz @@ -48,6 +49,7 @@ LIBS += \ -lboost_filesystem-mt \ -lboost_program_options-mt \ -lboost_thread-mt \ + -lboost_chrono-mt \ -lssl \ -lcrypto \ -lz |