Ticket #8638: boost_trunk_address_model.patch
File boost_trunk_address_model.patch, 4.8 KB (added by , 9 years ago) |
---|
-
boost/config/auto_link.hpp
15 15 USAGE: 16 16 ~~~~~~ 17 17 18 Before including this header you must define one or more of definethe following macros:18 Before including this header you must define one or more of the following macros: 19 19 20 20 BOOST_LIB_NAME: Required: A string containing the basename of the library, 21 21 for example boost_regex. … … 41 41 42 42 BOOST_LIB_PREFIX 43 43 + BOOST_LIB_NAME 44 + " _"44 + "-" 45 45 + BOOST_LIB_TOOLSET 46 46 + BOOST_LIB_THREAD_OPT 47 47 + BOOST_LIB_RT_OPT 48 + BOOST_LIB_ADDR_OPT 48 49 "-" 49 50 + BOOST_LIB_VERSION 50 51 … … 69 70 p STLport build. 70 71 n STLport build without its IOStreams. 71 72 73 BOOST_LIB_ADDR_OPT: The address model: "-32" or "-64". 74 72 75 BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. 73 76 74 77 … … 188 191 # define BOOST_LIB_THREAD_OPT 189 192 #endif 190 193 194 // 195 // select runtime opt: 196 // 191 197 #if defined(_MSC_VER) || defined(__MWERKS__) 192 198 193 199 # ifdef _DLL … … 347 353 #endif 348 354 349 355 // 356 // select address model opt: 357 // 358 #if defined(__x86_64__) || defined(__x86_64) \ 359 || defined(__amd64__) || defined(__amd64) \ 360 || defined(_M_X64) || defined(_M_AMD64) \ 361 || defined(_M_IA64) 362 # define BOOST_LIB_ADDR_OPT "-64" 363 #else 364 # define BOOST_LIB_ADDR_OPT "-32" 365 #endif 366 367 // 350 368 // select linkage opt: 351 369 // 352 370 #if (defined(_DLL) || defined(_RTLDLL)) && defined(BOOST_DYN_LINK) … … 365 383 && defined(BOOST_LIB_TOOLSET) \ 366 384 && defined(BOOST_LIB_THREAD_OPT) \ 367 385 && defined(BOOST_LIB_RT_OPT) \ 386 && defined(BOOST_LIB_ADDR_OPT) \ 368 387 && defined(BOOST_LIB_VERSION) 369 388 370 389 #ifdef BOOST_AUTO_LINK_TAGGED 371 # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")390 # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT ".lib") 372 391 # ifdef BOOST_LIB_DIAGNOSTIC 373 # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")392 # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT ".lib") 374 393 # endif 375 394 #elif defined(BOOST_AUTO_LINK_NOMANGLE) 376 395 # pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib") … … 378 397 # pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib") 379 398 # endif 380 399 #else 381 # 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")400 # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT "-" BOOST_LIB_VERSION ".lib") 382 401 # ifdef BOOST_LIB_DIAGNOSTIC 383 # 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")402 # 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_ADDR_OPT "-" BOOST_LIB_VERSION ".lib") 384 403 # endif 385 404 #endif 386 405 … … 400 419 #if defined(BOOST_LIB_NAME) 401 420 # undef BOOST_LIB_NAME 402 421 #endif 403 // Don't undef this one: it can be set by the user and should be the 422 // Don't undef this one: it can be set by the user and should be the 404 423 // same for all libraries: 405 424 //#if defined(BOOST_LIB_TOOLSET) 406 425 //# undef BOOST_LIB_TOOLSET … … 411 430 #if defined(BOOST_LIB_RT_OPT) 412 431 # undef BOOST_LIB_RT_OPT 413 432 #endif 433 #if defined(BOOST_LIB_ADDR_OPT) 434 # undef BOOST_LIB_ADDR_OPT 435 #endif 414 436 #if defined(BOOST_LIB_LINK_OPT) 415 437 # undef BOOST_LIB_LINK_OPT 416 438 #endif -
boostcpp.jam
122 122 if $(layout) = versioned 123 123 { 124 124 result = [ common.format-name 125 <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)125 <base> <toolset> <threading> <runtime> <address-model> -$(BOOST_VERSION_TAG) 126 126 -$(BUILD_ID) 127 127 : $(name) : $(type) : $(property-set) ] ; 128 128 } 129 129 else if $(layout) = tagged 130 130 { 131 131 result = [ common.format-name 132 <base> <threading> <runtime> 132 <base> <threading> <runtime> <address-model> 133 133 -$(BUILD_ID) 134 134 : $(name) : $(type) : $(property-set) ] ; 135 135 }