Mercurial > hg > vamp-build-and-test

comparison DEPENDENCIES/generic/include/boost/config/auto_link.hpp @ 101:c530137014c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
comparison
equal deleted inserted replaced
100:793467b5e61c 101:c530137014c0
154 # elif defined(BOOST_MSVC) && (BOOST_MSVC < 1800) 154 # elif defined(BOOST_MSVC) && (BOOST_MSVC < 1800)
155 155
156 // vc11: 156 // vc11:
157 # define BOOST_LIB_TOOLSET "vc110" 157 # define BOOST_LIB_TOOLSET "vc110"
158 158
159 # elif defined(BOOST_MSVC) 159 # elif defined(BOOST_MSVC) && (BOOST_MSVC < 1900)
160 160
161 // vc12: 161 // vc12:
162 # define BOOST_LIB_TOOLSET "vc120" 162 # define BOOST_LIB_TOOLSET "vc120"
163
164 # elif defined(BOOST_MSVC)
165
166 // vc14:
167 # define BOOST_LIB_TOOLSET "vc140"
163 168
164 # elif defined(__BORLANDC__) 169 # elif defined(__BORLANDC__)
165 170
166 // CBuilder 6: 171 // CBuilder 6:
167 # define BOOST_LIB_TOOLSET "bcb" 172 # define BOOST_LIB_TOOLSET "bcb"
380 #elif defined(BOOST_AUTO_LINK_NOMANGLE) 385 #elif defined(BOOST_AUTO_LINK_NOMANGLE)
381 # pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib") 386 # pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
382 # ifdef BOOST_LIB_DIAGNOSTIC 387 # ifdef BOOST_LIB_DIAGNOSTIC
383 # pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib") 388 # pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
384 # endif 389 # endif
390 #elif defined(BOOST_LIB_BUILDID)
391 # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
392 # ifdef BOOST_LIB_DIAGNOSTIC
393 # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
394 # endif
385 #else 395 #else
386 # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib") 396 # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
387 # ifdef BOOST_LIB_DIAGNOSTIC 397 # ifdef BOOST_LIB_DIAGNOSTIC
388 # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib") 398 # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
389 # endif 399 # endif