Patch for boost ticket #4349 (https://svn.boost.org/trac/boost/ticket/4349) Index: boost/config/auto_link.hpp =================================================================== --- boost/config/auto_link.hpp (revision 63014) +++ boost/config/auto_link.hpp (working copy) @@ -60,14 +60,14 @@ BOOST_LIB_RT_OPT: A suffix that indicates the runtime library used, contains one or more of the following letters after - a hiphen: + a hyphen: s static runtime (dynamic if not present). g debug/diagnostic runtime (release if not present). y Python debug/diagnostic runtime (release if not present). d debug build (release if not present). - g debug/diagnostic runtime (release if not present). - p STLPort Build. + p STLport build. + n STLport build without its IOStreams. BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. @@ -118,7 +118,7 @@ #if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) # ifdef UNDER_CE - // vc6: + // eVC4: # define BOOST_LIB_TOOLSET "evc4" # else // vc6: @@ -195,13 +195,15 @@ # define BOOST_LIB_RT_OPT "-gdp" # elif defined(_DEBUG)\ && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON) -# define BOOST_LIB_RT_OPT "-gydp" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-ydp" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # elif defined(_DEBUG) -# define BOOST_LIB_RT_OPT "-gdp" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-dp" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # else # define BOOST_LIB_RT_OPT "-p" # endif @@ -215,13 +217,15 @@ # define BOOST_LIB_RT_OPT "-gdpn" # elif defined(_DEBUG)\ && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON) -# define BOOST_LIB_RT_OPT "-gydpn" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-ydpn" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # elif defined(_DEBUG) -# define BOOST_LIB_RT_OPT "-gdpn" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-dpn" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # else # define BOOST_LIB_RT_OPT "-pn" # endif @@ -229,9 +233,9 @@ # else # if defined(_DEBUG) && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON) -# define BOOST_LIB_RT_OPT "-gyd" +# define BOOST_LIB_RT_OPT "-yd" # elif defined(_DEBUG) -# define BOOST_LIB_RT_OPT "-gd" +# define BOOST_LIB_RT_OPT "-d" # else # define BOOST_LIB_RT_OPT # endif @@ -249,13 +253,15 @@ # define BOOST_LIB_RT_OPT "-sgdp" # elif defined(_DEBUG)\ && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON) -# define BOOST_LIB_RT_OPT "-sgydp" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-sydp" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # elif defined(_DEBUG) -# define BOOST_LIB_RT_OPT "-sgdp" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-sdp" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # else # define BOOST_LIB_RT_OPT "-sp" # endif @@ -269,13 +275,15 @@ # define BOOST_LIB_RT_OPT "-sgdpn" # elif defined(_DEBUG)\ && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON) -# define BOOST_LIB_RT_OPT "-sgydpn" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-sydpn" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # elif defined(_DEBUG) -# define BOOST_LIB_RT_OPT "-sgdpn" -# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" +# define BOOST_LIB_RT_OPT "-sdpn" +# ifdef BOOST_LIB_DIAGNOSTIC +# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG by default") +# endif # else # define BOOST_LIB_RT_OPT "-spn" # endif @@ -284,9 +292,9 @@ # if defined(_DEBUG)\ && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON) -# define BOOST_LIB_RT_OPT "-sgyd" +# define BOOST_LIB_RT_OPT "-syd" # elif defined(_DEBUG) -# define BOOST_LIB_RT_OPT "-sgd" +# define BOOST_LIB_RT_OPT "-sd" # else # define BOOST_LIB_RT_OPT "-s" # endif @@ -307,7 +315,7 @@ // sanity check: // #if defined(__STL_DEBUG) || defined(_STLP_DEBUG) -#error "Pre-built versions of the Boost libraries are not provided in STLPort-debug form" +#error "Pre-built versions of the Boost libraries are not provided in STLport-debug form" #endif # ifdef _RTLDLL