fixed msvc-stlport builds.

[SVN r21168]
This commit is contained in:
John Maddock
2003-12-07 13:09:44 +00:00
parent e79458b0e3
commit 7f93cee9af
3 changed files with 19 additions and 1 deletions

View File

@ -27,6 +27,16 @@ template regex-dll-options
<runtime-link>dynamic
;
#
# this template defines extra settings required to work
# around STLPort defects when used with msvc 6:
#
template msvc-stlport-tricky
: # sources
: <msvc-stlport><*><runtime-build>release
<define>BOOST_ALL_NO_LIB=1
;
SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
cregex fileiter posix_api regex regex_debug
regex_synch w32_regex_traits wide_posix_api instances winstances ;
@ -61,3 +71,4 @@ install regex lib
;

View File

@ -26,7 +26,7 @@ rule regex-test-run ( sources + : input * )
test-suite regex-examples :
[ regex-test-run timer/regex_timer.cpp : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
[ regex-test-run timer/regex_timer.cpp <template>../build/msvc-stlport-tricky : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
[ regex-test-run jgrep/jgrep.cpp jgrep/main.cpp : -n boost/ $(BOOST_ROOT)/boost/regex.hpp ]
[ regex-test-run snippets/credit_card_example.cpp ]
[ regex-test-run snippets/partial_regex_grep.cpp : $(BOOST_ROOT)/libs/regex/index.htm ]
@ -52,3 +52,5 @@ test-suite regex-examples :

View File

@ -71,6 +71,7 @@ test-suite regex
[ regex-test regex_wide_regress
: <template>regression # sources
<template>../build/msvc-stlport-tricky
: <define>TEST_UNICODE=1 # requirements
: regress/tests.txt # input files
]
@ -120,6 +121,7 @@ test-suite regex
[ regex-test regex_wide_regress_dll
: <template>regression-dll # sources
<template>../build/msvc-stlport-tricky
: <define>TEST_UNICODE=1 # requirements
: regress/tests.txt # input files
]
@ -134,3 +136,6 @@ test-suite regex