Removed non-functioning msvc link command from Jamfile, added user32.lib forced link to w32_regex_traits.cpp

[SVN r10886]
This commit is contained in:
John Maddock
2001-08-18 10:22:10 +00:00
parent b2ea26705d
commit 014b66b2f4
2 changed files with 8 additions and 2 deletions

View File

@ -1,13 +1,11 @@
subproject libs/regex/example ; subproject libs/regex/example ;
NOCARE user32.lib ;
exe timer : timer/regex_timer.cpp exe timer : timer/regex_timer.cpp
<lib>../build/libboost_regex$(SUFLIB) <lib>../build/libboost_regex$(SUFLIB)
: :
<include>$(BOOST_ROOT) <include>$(BOOST_ROOT)
<define>BOOST_RE_NO_LIB=1 <define>BOOST_RE_NO_LIB=1
<msvc><*><find-library>user32.lib
: :
debug debug
<runtime-link>dynamic <runtime-link>dynamic
@ -146,3 +144,4 @@ exe regex_split_example_2 : snippets/regex_split_example_2.cpp

View File

@ -32,6 +32,13 @@
#if defined(_WIN32) && !defined(BOOST_RE_NO_W32) #if defined(_WIN32) && !defined(BOOST_RE_NO_W32)
//
// VC6 needs to link to user32.lib:
//
#ifdef BOOST_MSVC
#pragma comment(lib, "user32.lib")
#endif
namespace{ namespace{
// //