Browse Source

Merge pull request #2635 from gavinandresen/boost_chrono_osx

Link with boost_chrono library on OSX
pull/1/head
Gavin Andresen 9 years ago
parent
commit
dc4cf7c183
  1. 1
      bitcoin-qt.pro
  2. 2
      src/makefile.osx

1
bitcoin-qt.pro

@ -411,6 +411,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX @@ -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 {

2
src/makefile.osx vendored

@ -36,6 +36,7 @@ LIBS += \ @@ -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 += \ @@ -48,6 +49,7 @@ LIBS += \
-lboost_filesystem-mt \
-lboost_program_options-mt \
-lboost_thread-mt \
-lboost_chrono-mt \
-lssl \
-lcrypto \
-lz

Loading…
Cancel
Save