mirror of
https://github.com/twisterarmy/twister-core.git
synced 2025-01-09 06:18:02 +00:00
Merge pull request #2635 from gavinandresen/boost_chrono_osx
Link with boost_chrono library on OSX
This commit is contained in:
commit
dc4cf7c183
@ -411,6 +411,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
|
|||||||
win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
|
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
|
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
|
win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
|
||||||
|
macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
|
||||||
|
|
||||||
contains(RELEASE, 1) {
|
contains(RELEASE, 1) {
|
||||||
!win32:!macx {
|
!win32:!macx {
|
||||||
|
@ -36,6 +36,7 @@ LIBS += \
|
|||||||
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
|
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
|
||||||
$(DEPSDIR)/lib/libboost_program_options-mt.a \
|
$(DEPSDIR)/lib/libboost_program_options-mt.a \
|
||||||
$(DEPSDIR)/lib/libboost_thread-mt.a \
|
$(DEPSDIR)/lib/libboost_thread-mt.a \
|
||||||
|
$(DEPSDIR)/lib/libboost_chrono-mt.a \
|
||||||
$(DEPSDIR)/lib/libssl.a \
|
$(DEPSDIR)/lib/libssl.a \
|
||||||
$(DEPSDIR)/lib/libcrypto.a \
|
$(DEPSDIR)/lib/libcrypto.a \
|
||||||
-lz
|
-lz
|
||||||
@ -48,6 +49,7 @@ LIBS += \
|
|||||||
-lboost_filesystem-mt \
|
-lboost_filesystem-mt \
|
||||||
-lboost_program_options-mt \
|
-lboost_program_options-mt \
|
||||||
-lboost_thread-mt \
|
-lboost_thread-mt \
|
||||||
|
-lboost_chrono-mt \
|
||||||
-lssl \
|
-lssl \
|
||||||
-lcrypto \
|
-lcrypto \
|
||||||
-lz
|
-lz
|
||||||
|
Loading…
Reference in New Issue
Block a user