Skip to content

Commit

Permalink
* Updated boost build files
Browse files Browse the repository at this point in the history
  • Loading branch information
jredmondson committed Mar 12, 2019
1 parent 225d38f commit 18af4a6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions scripts/projects/common/using_boost.mpb
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
project {


expand(BOOST_ROOT_LIB) {
$BOOST_ROOT_LIB
$(BOOST_ROOT)/stage/lib
}

// b2 builds libboost_system with the following example formats:
// libboost_system-vc141-mt-gd-x64-1_67.lib(Debug)
// libboost_system-vc141-mt-x64-1_67.lib(Release)
// libboost_system-vc141-mt-gd-x64-1_67.lib (Debug)
// libboost_system-vc141-mt-x64-1_67.lib (Release)
// we want to allow Windows devs to customize their linked boost libs

expand(BOOST_TOOLSET) {
Expand Down Expand Up @@ -37,13 +39,16 @@ project {
specific(prop:windows) {
libpaths += $(BOOST_ROOT_LIB)
includes += $(BOOST_ROOT)

macros += _WINSOCK_DEPRECATED_NO_WARNINGS BOOST_ALL_NO_LIB

Debug::lit_libs += $(BOOST_SYSTEM_DEBUG)
Release::lit_libs += $(BOOST_SYSTEM_RELEASE)
// end if windows build
} else {
lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_system$(BOOST_CFG)
libpaths += /usr/local/lib
libpaths += /usr/local/Cellar/boost@1.59/1.59.0/lib
includes += /usr/local/Cellar/boost@1.59/1.59.0/include
}
}
2 changes: 1 addition & 1 deletion using_boost.mpb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ project {
// end if windows build
} else {
lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_system$(BOOST_CFG)
libpaths += /usr/local/lib
libpaths += /usr/local/lib
libpaths += /usr/local/Cellar/boost@1.59/1.59.0/lib
includes += /usr/local/Cellar/boost@1.59/1.59.0/include
}
Expand Down

0 comments on commit 18af4a6

Please sign in to comment.