feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Move block so git does not think there is a conflict.

Browse Source
This commit is contained in:
Edward Diener
2020-03-24 21:25:46 -04:00
parent 1ec083d6c2
commit 4916249f72
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/config/auto_link.hpp
View File

@ -436,6 +436,12 @@ BOOST_LIB_SUFFIX: Static/import libraries extension (".lib", ".a") for the c
# define BOOST_LIB_PREFIX "lib" # define BOOST_LIB_PREFIX "lib"
#endif #endif
#if defined(BOOST_EMBTC_WIN64)
# define BOOST_LIB_SUFFIX ".a"
#else
# define BOOST_LIB_SUFFIX ".lib"
#endif
// //
// now include the lib: // now include the lib:
// //
@ -447,12 +453,6 @@ BOOST_LIB_SUFFIX: Static/import libraries extension (".lib", ".a") for the c
&& defined(BOOST_LIB_ARCH_AND_MODEL_OPT) \ && defined(BOOST_LIB_ARCH_AND_MODEL_OPT) \
&& defined(BOOST_LIB_VERSION) && defined(BOOST_LIB_VERSION)
#if defined(BOOST_EMBTC_WIN64)
# define BOOST_LIB_SUFFIX ".a"
#else
# define BOOST_LIB_SUFFIX ".lib"
#endif
#ifdef BOOST_AUTO_LINK_NOMANGLE #ifdef BOOST_AUTO_LINK_NOMANGLE
# pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_SUFFIX) # pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_SUFFIX)
# ifdef BOOST_LIB_DIAGNOSTIC # ifdef BOOST_LIB_DIAGNOSTIC