Ticket #6537: boost auto_link ticket6537.patch

File boost auto_link ticket6537.patch, 7.4 KB (added by Ulrich Eckhardt <ulrich.eckhardt@…>, 11 years ago)

patch

  • auto_link.hpp

     
    6060
    6161BOOST_LIB_RT_OPT:     A suffix that indicates the runtime library used,
    6262                      contains one or more of the following letters after
    63                       a hiphen:
     63                      a hyphen:
    6464
    6565                      s      static runtime (dynamic if not present).
    6666                      g      debug/diagnostic runtime (release if not present).
    6767                      y      Python debug/diagnostic runtime (release if not present).
    6868                      d      debug build (release if not present).
    69                       g      debug/diagnostic runtime (release if not present).
    70                       p      STLPort Build.
     69                      p      STLport build.
     70                      n      STLport build without its IOStreams.
    7171
    7272BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
    7373
    … …  
    114114// select toolset if not defined already:
    115115//
    116116#ifndef BOOST_LIB_TOOLSET
    117 // Note: no compilers before 1200 are supported
    118 #if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
     117#  if defined(BOOST_MSVC) && (BOOST_MSVC < 1200)
     118    // Note: no compilers before 1200 are supported
     119#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
    119120
    120 #  ifdef UNDER_CE
    121      // vc6:
    122 #    define BOOST_LIB_TOOLSET "evc4"
    123 #  else
    124      // vc6:
    125 #    define BOOST_LIB_TOOLSET "vc6"
    126 #  endif
     121#    ifdef UNDER_CE
     122       // eVC4:
     123#      define BOOST_LIB_TOOLSET "evc4"
     124#    else
     125       // vc6:
     126#      define BOOST_LIB_TOOLSET "vc6"
     127#    endif
    127128
    128 #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1300)
     129#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1310)
    129130
    130    // vc7:
    131 #  define BOOST_LIB_TOOLSET "vc7"
     131     // vc7:
     132#    define BOOST_LIB_TOOLSET "vc7"
    132133
    133 #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
     134#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1400)
    134135
    135    // vc71:
    136 #  define BOOST_LIB_TOOLSET "vc71"
     136     // vc71:
     137#    define BOOST_LIB_TOOLSET "vc71"
    137138
    138 #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1400)
     139#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1500)
    139140
    140    // vc80:
    141 #  define BOOST_LIB_TOOLSET "vc80"
     141     // vc80:
     142#    define BOOST_LIB_TOOLSET "vc80"
    142143
    143 #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
     144#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1600)
    144145
    145    // vc90:
    146 #  define BOOST_LIB_TOOLSET "vc90"
     146     // vc90:
     147#    define BOOST_LIB_TOOLSET "vc90"
    147148
    148 #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1600)
     149#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1700)
    149150
    150    // vc10:
    151 #  define BOOST_LIB_TOOLSET "vc100"
     151     // vc10:
     152#    define BOOST_LIB_TOOLSET "vc100"
    152153
    153 #elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1700)
     154#  elif defined(BOOST_MSVC)
    154155
    155    // vc11:
    156 #  define BOOST_LIB_TOOLSET "vc110"
     156     // vc11:
     157#    define BOOST_LIB_TOOLSET "vc110"
    157158
    158 #elif defined(__BORLANDC__)
     159#  elif defined(__BORLANDC__)
    159160
    160    // CBuilder 6:
    161 #  define BOOST_LIB_TOOLSET "bcb"
     161     // CBuilder 6:
     162#    define BOOST_LIB_TOOLSET "bcb"
    162163
    163 #elif defined(__ICL)
     164#  elif defined(__ICL)
    164165
    165    // Intel C++, no version number:
    166 #  define BOOST_LIB_TOOLSET "iw"
     166     // Intel C++, no version number:
     167#    define BOOST_LIB_TOOLSET "iw"
    167168
    168 #elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
     169#  elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
    169170
    170    // Metrowerks CodeWarrior 8.x
    171 #  define BOOST_LIB_TOOLSET "cw8"
     171     // Metrowerks CodeWarrior 8.x
     172#    define BOOST_LIB_TOOLSET "cw8"
    172173
    173 #elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
     174#  elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
    174175
    175    // Metrowerks CodeWarrior 9.x
    176 #  define BOOST_LIB_TOOLSET "cw9"
     176     // Metrowerks CodeWarrior 9.x
     177#    define BOOST_LIB_TOOLSET "cw9"
    177178
    178 #endif
     179#  endif
    179180#endif // BOOST_LIB_TOOLSET
    180181
    181182//
    … …  
    201202#        elif defined(_DEBUG)\
    202203               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
    203204#            define BOOST_LIB_RT_OPT "-gydp"
    204 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     205#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    205206#            error "Build options aren't compatible with pre-built libraries"
    206207#        elif defined(_DEBUG)
    207208#            define BOOST_LIB_RT_OPT "-gdp"
    208 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     209#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    209210#            error "Build options aren't compatible with pre-built libraries"
    210211#        else
    211212#            define BOOST_LIB_RT_OPT "-p"
    … …  
    221222#        elif defined(_DEBUG)\
    222223               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
    223224#            define BOOST_LIB_RT_OPT "-gydpn"
    224 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     225#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    225226#            error "Build options aren't compatible with pre-built libraries"
    226227#        elif defined(_DEBUG)
    227228#            define BOOST_LIB_RT_OPT "-gdpn"
    228 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     229#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    229230#            error "Build options aren't compatible with pre-built libraries"
    230231#        else
    231232#            define BOOST_LIB_RT_OPT "-pn"
    … …  
    255256#        elif defined(_DEBUG)\
    256257               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
    257258#             define BOOST_LIB_RT_OPT "-sgydp"
    258 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     259#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    259260#            error "Build options aren't compatible with pre-built libraries"
    260261#        elif defined(_DEBUG)
    261262#             define BOOST_LIB_RT_OPT "-sgdp"
    262 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     263#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    263264#            error "Build options aren't compatible with pre-built libraries"
    264265#        else
    265266#            define BOOST_LIB_RT_OPT "-sp"
    … …  
    275276#        elif defined(_DEBUG)\
    276277               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
    277278#             define BOOST_LIB_RT_OPT "-sgydpn"
    278 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     279#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    279280#            error "Build options aren't compatible with pre-built libraries"
    280281#        elif defined(_DEBUG)
    281282#             define BOOST_LIB_RT_OPT "-sgdpn"
    282 #            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
     283#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
    283284#            error "Build options aren't compatible with pre-built libraries"
    284285#        else
    285286#            define BOOST_LIB_RT_OPT "-spn"
    … …  
    312313// sanity check:
    313314//
    314315#if defined(__STL_DEBUG) || defined(_STLP_DEBUG)
    315 #error "Pre-built versions of the Boost libraries are not provided in STLPort-debug form"
     316#error "Pre-built versions of the Boost libraries are not provided in STLport-debug form"
    316317#endif
    317318
    318319#  ifdef _RTLDLL