merged changes in regex5 branch

[SVN r26692]

build/Jamfile

@@ -1,6 +1,117 @@
 # copyright John Maddock 2003
 
 subproject libs/regex/build ;
+# bring in the rules for testing
+import testing ;
+
+#
+# ICU configuration:
+#
+rule check-icu-config ( )
+{
+   if ! $(gICU_CONFIG_CHECKED)
+   {
+      if $(ICU_PATH)
+      {
+         dir += $(ICU_PATH) ;
+      }
+      
+      if [ GLOB $(dir)$(SLASH)include$(SLASH)unicode : utypes.h ]
+      {
+         ECHO Building Boost.Regex with Unicode/ICU support enabled ;
+         ECHO Using ICU in $(ICU_PATH:J=" ")$(SLASH)include ;
+         gHAS_ICU = true ;
+         
+         # try and find ICU libraries, look for NT versions first:
+         if $(ICU_LINK)
+         {
+            gICU_LIBS += <linkflags>$(ICU_LINK) ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : icuuc.* ]
+         {
+            gICU_LIBS += <find-library>icuuc ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : libicuuc.* ]
+         {
+            gICU_LIBS += <find-library>icuuc ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
+         {
+            gICU_LIBS += <library-file>$(ICU_PATH)/lib/cygicuuc.dll ;
+         }
+         else if [ GLOB /usr/local/lib : cygicuuc.dll ]
+         {
+            gICU_LIBS += <library-file>/usr/local/lib/cygicuuc.dll ;
+         }
+         else
+         {
+            ECHO ICU shared common library not found. ;
+            ECHO HINT: Set the environment variable ICU_LINK to contain ;
+            ECHO       the linker options required to link to ICU. ;
+         }
+         
+         if $(ICU_LINK)
+         {
+            # gICU_LIBS += <linkflags>$(ICU_LINK) ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : icuin.* ]
+         {
+            gICU_LIBS += <find-library>icuin ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : libicui18n.* ]
+         {
+            gICU_LIBS += <find-library>icui18n ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
+         {
+            gICU_LIBS += <library-file>$(ICU_PATH)/lib/cygicuin.dll ;
+         }
+         else if [ GLOB /usr/local/lib : cygicuin.dll ]
+         {
+            gICU_LIBS += <library-file>/usr/local/lib/cygicuin.dll ;
+         }
+         else
+         {
+            ECHO ICU shared i18n library not found. ;
+            ECHO HINT: Set the environment variable ICU_LINK to contain ;
+            ECHO       the linker options required to link to ICU. ;
+         }
+      }
+      else
+      {
+         ECHO ****************************************************** ;
+         ECHO ;
+         ECHO Building Boost.Regex with Unicode/ICU support disabled. ;
+         ECHO HINT: define the environment variable ICU_PATH to point to the ;
+         ECHO root directy of your ICU installation if you have one. ;
+         ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")$(SLASH)include$(SLASH)unicode ;
+         ECHO ;
+         ECHO ****************************************************** ;
+      }
+      gICU_CONFIG_CHECKED = true ;
+   }
+    if $(gHAS_ICU)
+    {
+        return true ;
+    }
+}
+
+if [ check-icu-config ]
+{
+   BOOST_REGEX_ICU_OPTS = "<define>BOOST_HAS_ICU=1" ;
+   if $(gICU_LIBS)
+   {
+      BOOST_REGEX_ICU_OPTS += $(gICU_LIBS) ;
+      # this one is required for VC++ :
+      BOOST_REGEX_ICU_TEST_OPTS = "<native-wchar_t>off" ;
+   }
+   if $(ICU_PATH)
+   {
+      BOOST_REGEX_ICU_OPTS += "<sysinclude>$(ICU_PATH)/include" ;
+      BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
+   }
+   # ECHO "BOOST_REGEX_ICU_OPTS =" $(BOOST_REGEX_ICU_OPTS) ;
+}
 
 #
 # this template defines the options common to
@@ -14,6 +125,12 @@ template regex-options
      # <native-wchar_t>on
      # como requires this:
      <como-win32><*><define>BOOST_REGEX_NO_W32=1
+     $(BOOST_REGEX_ICU_OPTS)
+   ;
+template regex-test-options
+   : # sources
+   : # requirements
+     $(BOOST_REGEX_ICU_TEST_OPTS)
    ;
 
 #
@@ -37,11 +154,27 @@ template msvc-stlport-tricky
      <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 ;
+SOURCES = 
+   c_regex_traits.cpp
+   cpp_regex_traits.cpp
+   cregex.cpp
+   fileiter.cpp
+   icu.cpp
+   instances.cpp
+   posix_api.cpp
+   regex.cpp
+   regex_debug.cpp
+   regex_raw_buffer.cpp
+   regex_traits_defaults.cpp
+   static_mutex.cpp
+   w32_regex_traits.cpp
+   wc_regex_traits.cpp
+   wide_posix_api.cpp
+   winstances.cpp 
+   usinstances.cpp ;
+   
        
-lib boost_regex : ../src/$(SOURCES).cpp <template>regex-options
+lib boost_regex : ../src/$(SOURCES) <template>regex-options
     : 
         common-variant-tag
     : 
@@ -49,7 +182,7 @@ lib boost_regex : ../src/$(SOURCES).cpp <template>regex-options
     ;
 
 
-dll boost_regex : ../src/$(SOURCES).cpp <template>regex-dll-options
+dll boost_regex : ../src/$(SOURCES) <template>regex-dll-options
     : 
         common-variant-tag
     : 

build/Jamfile.v2

@@ -2,13 +2,125 @@
 project boost/regex
     : source-location ../src
     ;
-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 ;
+
+#
+# ICU configuration:
+#
+local ICU_PATH = [ modules.peek : ICU_PATH ] ;
+rule check-icu-config ( )
+{
+   local ICU_PATH = [ modules.peek : ICU_PATH ] ;
+   if ! $(gICU_CONFIG_CHECKED)
+   {
+      if $(ICU_PATH)
+      {
+         dir = $(ICU_PATH) ;
+      }
+      
+      if [ GLOB $(dir)/include/unicode : utypes.h ]
+      {
+         ECHO Building Boost.Regex with Unicode/ICU support enabled ;
+         ECHO Using ICU in $(ICU_PATH:J=" ")/include ;
+         gHAS_ICU = true ;
+         
+         # try and find ICU libraries, look for NT versions first:
+         if [ GLOB $(dir)/lib : icuuc.* ]
+         {
+            gICU_CORE_LIB = icuuc ;
+         }
+         else if [ GLOB $(dir)/lib : libicuuc.* ]
+         {
+            gICU_CORE_LIB = icuuc ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
+         {
+            gICU_CORE_LIB = cygicuuc.dll ;
+         }
+         else
+         {
+            ECHO ICU shared common library not found. ;
+         }
+         
+         if [ GLOB $(dir)/lib : icuin.* ]
+         {
+            gICU_IN_LIB = icuin ;
+         }
+         else if [ GLOB $(dir)/lib : libicui18n.* ]
+         {
+            gICU_IN_LIB = icuin ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
+         {
+            gICU_IN_LIB = cygicuin.dll ;
+         }
+         else
+         {
+            ECHO ICU shared i18n library not found. ;
+         }
+      }
+      else
+      {
+         ECHO ****************************************************** ;
+         ECHO ;
+         ECHO Building Boost.Regex with Unicode/ICU support disabled. ;
+         ECHO HINT: define the environment variable ICU_PATH to point to the ;
+         ECHO root directy of your ICU installation if you have one. ;
+         ECHO Couldn't find utypes.h in \"$(ICU_PATH:J=" ")/include/unicode\" ;
+         ECHO ;
+         ECHO ****************************************************** ;
+      }
+      gICU_CONFIG_CHECKED = true ;
+   }
+    if $(gHAS_ICU)
+    {
+        return true ;
+    }
+}
+
+if [ check-icu-config ]
+{
+   BOOST_REGEX_ICU_OPTS = "<define>BOOST_HAS_ICU=1" ;
+   if $(gICU_CORE_LIB)
+   {
+      lib icucore : : <name>$(gICU_CORE_LIB) <search>/$(ICU_PATH)/lib ;
+      ICU_EXTRA_SOURCE = icucore ;
+   }
+   if $(gICU_IN_LIB)
+   {
+      lib icuin : : <name>$(gICU_IN_LIB) <search>/$(ICU_PATH)/lib ;
+      ICU_EXTRA_SOURCE += icuin ;
+   }
+   if $(ICU_PATH)
+   {
+      BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;
+      #BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
+   }
+}
+
+SOURCES = 
+   c_regex_traits.cpp
+   cpp_regex_traits.cpp
+   cregex.cpp
+   fileiter.cpp
+   icu.cpp
+   instances.cpp
+   posix_api.cpp
+   regex.cpp
+   regex_debug.cpp
+   regex_raw_buffer.cpp
+   regex_traits_defaults.cpp
+   static_mutex.cpp
+   w32_regex_traits.cpp
+   wc_regex_traits.cpp
+   wide_posix_api.cpp
+   winstances.cpp 
+   usinstances.cpp ;
 
 
-lib boost_regex : $(SOURCES).cpp 
+lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
     :         
-        <variant>debug:<define>BOOST_REGEX_CONFIG_INFO=1
-	<link>shared:<define>BOOST_REGEX_DYN_LINK=1
+        #<link>static:<define>BOOST_REGEX_NO_LIB=1
+        #<link>static:<define>BOOST_REGEX_STATIC_LINK=1
+	     <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+	     $(BOOST_REGEX_ICU_OPTS)
     ;

build/bcb6.mak

@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : bcb bcb\libboost_regex-bcb-s-1_32 bcb\libboost_regex-bcb-s-1_32.lib bcb\libboost_regex-bcb-mt-s-1_32 bcb\libboost_regex-bcb-mt-s-1_32.lib bcb\boost_regex-bcb-mt-1_32 bcb\boost_regex-bcb-mt-1_32.lib bcb\boost_regex-bcb-1_32 bcb\boost_regex-bcb-1_32.lib bcb\libboost_regex-bcb-mt-1_32 bcb\libboost_regex-bcb-mt-1_32.lib bcb\libboost_regex-bcb-1_32 bcb\libboost_regex-bcb-1_32.lib bcb\libboost_regex-bcb-sd-1_32 bcb\libboost_regex-bcb-sd-1_32.lib bcb\libboost_regex-bcb-mt-sd-1_32 bcb\libboost_regex-bcb-mt-sd-1_32.lib bcb\boost_regex-bcb-mt-d-1_32 bcb\boost_regex-bcb-mt-d-1_32.lib bcb\boost_regex-bcb-d-1_32 bcb\boost_regex-bcb-d-1_32.lib bcb\libboost_regex-bcb-mt-d-1_32 bcb\libboost_regex-bcb-mt-d-1_32.lib bcb\libboost_regex-bcb-d-1_32 bcb\libboost_regex-bcb-d-1_32.lib
 
@@ -77,11 +77,6 @@ bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -97,6 +92,11 @@ bcb\libboost_regex-bcb-s-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-s-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-s-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\instances.obj ../src/instances.cpp
@@ -117,9 +117,24 @@ bcb\libboost_regex-bcb-s-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -127,6 +142,11 @@ bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-s-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -146,10 +166,10 @@ libboost_regex-bcb-s-1_32_clean :
 	del bcb\libboost_regex-bcb-s-1_32\*.csm
 	del bcb\libboost_regex-bcb-s-1_32\*.tds
 
-bcb\libboost_regex-bcb-s-1_32.lib : bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\cregex.obj bcb\libboost_regex-bcb-s-1_32\fileiter.obj bcb\libboost_regex-bcb-s-1_32\instances.obj bcb\libboost_regex-bcb-s-1_32\posix_api.obj bcb\libboost_regex-bcb-s-1_32\regex.obj bcb\libboost_regex-bcb-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-s-1_32\regex_synch.obj bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_32\winstances.obj
+bcb\libboost_regex-bcb-s-1_32.lib : bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\cregex.obj bcb\libboost_regex-bcb-s-1_32\fileiter.obj bcb\libboost_regex-bcb-s-1_32\icu.obj bcb\libboost_regex-bcb-s-1_32\instances.obj bcb\libboost_regex-bcb-s-1_32\posix_api.obj bcb\libboost_regex-bcb-s-1_32\regex.obj bcb\libboost_regex-bcb-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-s-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_32\static_mutex.obj bcb\libboost_regex-bcb-s-1_32\usinstances.obj bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-s-1_32.lib del bcb\libboost_regex-bcb-s-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_32.lib"  +"bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_32.lib"  +"bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_32\icu.obj" +"bcb\libboost_regex-bcb-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\winstances.obj"
 |
 
 ########################################################
@@ -162,11 +182,6 @@ bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -182,6 +197,11 @@ bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-s-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-s-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\instances.obj ../src/instances.cpp
@@ -202,9 +222,24 @@ bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_H
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -212,6 +247,11 @@ bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.c
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-s-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -231,10 +271,10 @@ libboost_regex-bcb-mt-s-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-s-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-s-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-s-1_32.lib : bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_32\instances.obj bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\regex.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-s-1_32.lib : bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_32\icu.obj bcb\libboost_regex-bcb-mt-s-1_32\instances.obj bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\regex.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-s-1_32.lib del bcb\libboost_regex-bcb-mt-s-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_32.lib"  +"bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_32.lib"  +"bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj"
 |
 
 ########################################################
@@ -247,11 +287,6 @@ bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -267,6 +302,11 @@ bcb\boost_regex-bcb-mt-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-mt-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-mt-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\instances.obj ../src/instances.cpp
@@ -287,9 +327,24 @@ bcb\boost_regex-bcb-mt-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -297,6 +352,11 @@ bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-mt-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -317,9 +377,9 @@ boost_regex-bcb-mt-1_32_clean :
 	del bcb\boost_regex-bcb-mt-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-1_32.lib : bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\winstances.obj
+bcb\boost_regex-bcb-mt-1_32.lib : bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\icu.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-1_32\usinstances.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\icu.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-1_32\usinstances.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-1_32.lib bcb\boost_regex-bcb-mt-1_32.dll
 
@@ -333,11 +393,6 @@ bcb\boost_regex-bcb-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEA
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -353,6 +408,11 @@ bcb\boost_regex-bcb-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\instances.obj ../src/instances.cpp
@@ -373,9 +433,24 @@ bcb\boost_regex-bcb-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -383,6 +458,11 @@ bcb\boost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -403,9 +483,9 @@ boost_regex-bcb-1_32_clean :
 	del bcb\boost_regex-bcb-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-1_32.lib : bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_synch.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\winstances.obj
+bcb\boost_regex-bcb-1_32.lib : bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\icu.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-1_32\static_mutex.obj bcb\boost_regex-bcb-1_32\usinstances.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_synch.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\icu.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-1_32\static_mutex.obj bcb\boost_regex-bcb-1_32\usinstances.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-1_32.lib bcb\boost_regex-bcb-1_32.dll
 
@@ -419,11 +499,6 @@ bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(A
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -439,6 +514,11 @@ bcb\libboost_regex-bcb-mt-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\instances.obj ../src/instances.cpp
@@ -459,9 +539,24 @@ bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEA
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -469,6 +564,11 @@ bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -488,10 +588,10 @@ libboost_regex-bcb-mt-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-1_32.lib : bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\cregex.obj bcb\libboost_regex-bcb-mt-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-1_32\instances.obj bcb\libboost_regex-bcb-mt-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-1_32\regex.obj bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-1_32.lib : bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\cregex.obj bcb\libboost_regex-bcb-mt-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-1_32\icu.obj bcb\libboost_regex-bcb-mt-1_32\instances.obj bcb\libboost_regex-bcb-mt-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-1_32\regex.obj bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-1_32.lib del bcb\libboost_regex-bcb-mt-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_32.lib"  +"bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_32.lib"  +"bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\winstances.obj"
 |
 
 ########################################################
@@ -504,11 +604,6 @@ bcb\libboost_regex-bcb-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -524,6 +619,11 @@ bcb\libboost_regex-bcb-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\instances.obj ../src/instances.cpp
@@ -544,9 +644,24 @@ bcb\libboost_regex-bcb-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -554,6 +669,11 @@ bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -573,10 +693,10 @@ libboost_regex-bcb-1_32_clean :
 	del bcb\libboost_regex-bcb-1_32\*.csm
 	del bcb\libboost_regex-bcb-1_32\*.tds
 
-bcb\libboost_regex-bcb-1_32.lib : bcb\libboost_regex-bcb-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_32\cregex.obj bcb\libboost_regex-bcb-1_32\fileiter.obj bcb\libboost_regex-bcb-1_32\instances.obj bcb\libboost_regex-bcb-1_32\posix_api.obj bcb\libboost_regex-bcb-1_32\regex.obj bcb\libboost_regex-bcb-1_32\regex_debug.obj bcb\libboost_regex-bcb-1_32\regex_synch.obj bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-1_32\winstances.obj
+bcb\libboost_regex-bcb-1_32.lib : bcb\libboost_regex-bcb-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_32\cregex.obj bcb\libboost_regex-bcb-1_32\fileiter.obj bcb\libboost_regex-bcb-1_32\icu.obj bcb\libboost_regex-bcb-1_32\instances.obj bcb\libboost_regex-bcb-1_32\posix_api.obj bcb\libboost_regex-bcb-1_32\regex.obj bcb\libboost_regex-bcb-1_32\regex_debug.obj bcb\libboost_regex-bcb-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_32\static_mutex.obj bcb\libboost_regex-bcb-1_32\usinstances.obj bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-1_32.lib del bcb\libboost_regex-bcb-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_32.lib"  +"bcb\libboost_regex-bcb-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\cregex.obj" +"bcb\libboost_regex-bcb-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-1_32\instances.obj" +"bcb\libboost_regex-bcb-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-1_32\regex.obj" +"bcb\libboost_regex-bcb-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_32.lib"  +"bcb\libboost_regex-bcb-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\cregex.obj" +"bcb\libboost_regex-bcb-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-1_32\icu.obj" +"bcb\libboost_regex-bcb-1_32\instances.obj" +"bcb\libboost_regex-bcb-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-1_32\regex.obj" +"bcb\libboost_regex-bcb-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_32\winstances.obj"
 |
 
 ########################################################
@@ -589,11 +709,6 @@ bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(A
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -609,6 +724,11 @@ bcb\libboost_regex-bcb-sd-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-sd-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-sd-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\instances.obj ../src/instances.cpp
@@ -629,9 +749,24 @@ bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEA
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -639,6 +774,11 @@ bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-sd-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -658,10 +798,10 @@ libboost_regex-bcb-sd-1_32_clean :
 	del bcb\libboost_regex-bcb-sd-1_32\*.csm
 	del bcb\libboost_regex-bcb-sd-1_32\*.tds
 
-bcb\libboost_regex-bcb-sd-1_32.lib : bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\cregex.obj bcb\libboost_regex-bcb-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-sd-1_32\instances.obj bcb\libboost_regex-bcb-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-sd-1_32\regex.obj bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-sd-1_32\regex_synch.obj bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_32\winstances.obj
+bcb\libboost_regex-bcb-sd-1_32.lib : bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\cregex.obj bcb\libboost_regex-bcb-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-sd-1_32\icu.obj bcb\libboost_regex-bcb-sd-1_32\instances.obj bcb\libboost_regex-bcb-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-sd-1_32\regex.obj bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-sd-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_32\static_mutex.obj bcb\libboost_regex-bcb-sd-1_32\usinstances.obj bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-sd-1_32.lib del bcb\libboost_regex-bcb-sd-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_32.lib"  +"bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_32.lib"  +"bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_32\icu.obj" +"bcb\libboost_regex-bcb-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\winstances.obj"
 |
 
 ########################################################
@@ -674,11 +814,6 @@ bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -694,6 +829,11 @@ bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-sd-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\instances.obj ../src/instances.cpp
@@ -714,9 +854,24 @@ bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -724,6 +879,11 @@ bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-sd-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -743,10 +903,10 @@ libboost_regex-bcb-mt-sd-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-sd-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-sd-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-sd-1_32.lib : bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-sd-1_32.lib : bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_32\icu.obj bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-sd-1_32.lib del bcb\libboost_regex-bcb-mt-sd-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_32.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_32.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj"
 |
 
 ########################################################
@@ -759,11 +919,6 @@ bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -779,6 +934,11 @@ bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-mt-d-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-mt-d-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\instances.obj ../src/instances.cpp
@@ -799,9 +959,24 @@ bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -809,6 +984,11 @@ bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-mt-d-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -829,9 +1009,9 @@ boost_regex-bcb-mt-d-1_32_clean :
 	del bcb\boost_regex-bcb-mt-d-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-d-1_32.lib : bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\winstances.obj
+bcb\boost_regex-bcb-mt-d-1_32.lib : bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\icu.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_32\usinstances.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\icu.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_32\usinstances.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-d-1_32.lib bcb\boost_regex-bcb-mt-d-1_32.dll
 
@@ -845,11 +1025,6 @@ bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_H
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -865,6 +1040,11 @@ bcb\boost_regex-bcb-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-d-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-d-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\instances.obj ../src/instances.cpp
@@ -885,9 +1065,24 @@ bcb\boost_regex-bcb-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-d-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-d-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-d-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -895,6 +1090,11 @@ bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(A
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-d-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -915,9 +1115,9 @@ boost_regex-bcb-d-1_32_clean :
 	del bcb\boost_regex-bcb-d-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-d-1_32.lib : bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_synch.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\winstances.obj
+bcb\boost_regex-bcb-d-1_32.lib : bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\icu.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_32\static_mutex.obj bcb\boost_regex-bcb-d-1_32\usinstances.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_synch.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\icu.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_32\static_mutex.obj bcb\boost_regex-bcb-d-1_32\usinstances.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-d-1_32.lib bcb\boost_regex-bcb-d-1_32.dll
 
@@ -931,11 +1131,6 @@ bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -951,6 +1146,11 @@ bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-d-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-d-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\instances.obj ../src/instances.cpp
@@ -971,9 +1171,24 @@ bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_H
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -981,6 +1196,11 @@ bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.c
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-d-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -1000,10 +1220,10 @@ libboost_regex-bcb-mt-d-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-d-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-d-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-d-1_32.lib : bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_32\instances.obj bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\regex.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-d-1_32.lib : bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_32\icu.obj bcb\libboost_regex-bcb-mt-d-1_32\instances.obj bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\regex.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-d-1_32.lib del bcb\libboost_regex-bcb-mt-d-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_32.lib"  +"bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_32.lib"  +"bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj"
 |
 
 ########################################################
@@ -1016,11 +1236,6 @@ bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -1036,6 +1251,11 @@ bcb\libboost_regex-bcb-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-d-1_32\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-d-1_32\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\instances.obj ../src/instances.cpp
@@ -1056,9 +1276,24 @@ bcb\libboost_regex-bcb-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_32\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_32\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_32\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_32\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -1066,6 +1301,11 @@ bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-d-1_32\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -1085,9 +1325,9 @@ libboost_regex-bcb-d-1_32_clean :
 	del bcb\libboost_regex-bcb-d-1_32\*.csm
 	del bcb\libboost_regex-bcb-d-1_32\*.tds
 
-bcb\libboost_regex-bcb-d-1_32.lib : bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\cregex.obj bcb\libboost_regex-bcb-d-1_32\fileiter.obj bcb\libboost_regex-bcb-d-1_32\instances.obj bcb\libboost_regex-bcb-d-1_32\posix_api.obj bcb\libboost_regex-bcb-d-1_32\regex.obj bcb\libboost_regex-bcb-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-d-1_32\regex_synch.obj bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_32\winstances.obj
+bcb\libboost_regex-bcb-d-1_32.lib : bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\cregex.obj bcb\libboost_regex-bcb-d-1_32\fileiter.obj bcb\libboost_regex-bcb-d-1_32\icu.obj bcb\libboost_regex-bcb-d-1_32\instances.obj bcb\libboost_regex-bcb-d-1_32\posix_api.obj bcb\libboost_regex-bcb-d-1_32\regex.obj bcb\libboost_regex-bcb-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-d-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_32\static_mutex.obj bcb\libboost_regex-bcb-d-1_32\usinstances.obj bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-d-1_32.lib del bcb\libboost_regex-bcb-d-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_32.lib"  +"bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_32.lib"  +"bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_32\icu.obj" +"bcb\libboost_regex-bcb-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\winstances.obj"
 |
 

build/gcc-shared.mak

@@ -10,6 +10,7 @@
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -28,8 +29,19 @@ C1=-c -O2 -I../../../ -fPIC
 #
 C2=-c -g -I../../../ -fPIC
 
+ifeq "$(ICU_PATH)" ""
+$(warning "Building Boost.Regex without ICU / Unicode support:")
+$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)/include
+ICU_LDFLAGS= -L$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+$(warning "Building Boost.Regex with ICU in $(ICU_PATH)")
+endif
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_32_shared ./gcc/libboost_regex-gcc-1_32.so gcc gcc/boost_regex-gcc-d-1_32_shared ./gcc/libboost_regex-gcc-d-1_32.so
 
@@ -48,43 +60,55 @@ install : all
 #
 ########################################################
 gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cregex.o $(C1) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-1_32_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-1_32_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-1_32_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/instances.o $(C1) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-1_32_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/posix_api.o $(C1) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-1_32_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex.o $(C1) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-1_32_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_32_shared/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-1_32_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-1_32_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-1_32_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/winstances.o $(C1) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-1_32_shared : 
 	mkdir -p gcc/boost_regex-gcc-1_32_shared
@@ -92,8 +116,8 @@ gcc/boost_regex-gcc-1_32_shared :
 boost_regex-gcc-1_32_clean :
 	rm -f gcc/boost_regex-gcc-1_32_shared/*.o
 
-./gcc/libboost_regex-gcc-1_32.so : gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_synch.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-1_32.so $(LDFLAGS)  gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_synch.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-1_32.so : gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/icu.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_32_shared/static_mutex.o gcc/boost_regex-gcc-1_32_shared/usinstances.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-1_32.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/icu.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_32_shared/static_mutex.o gcc/boost_regex-gcc-1_32_shared/usinstances.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o $(ICU_LIBS) $(LIBS)
 
 ########################################################
 #
@@ -101,43 +125,55 @@ boost_regex-gcc-1_32_clean :
 #
 ########################################################
 gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o $(C2) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o $(C2) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cregex.o $(C2) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o $(C2) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/instances.o $(C2) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o $(C2) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex.o $(C2) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o $(C2) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o $(C2) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o $(C2) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(C2) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared : 
 	mkdir -p gcc/boost_regex-gcc-d-1_32_shared
@@ -145,6 +181,6 @@ gcc/boost_regex-gcc-d-1_32_shared :
 boost_regex-gcc-d-1_32_clean :
 	rm -f gcc/boost_regex-gcc-d-1_32_shared/*.o
 
-./gcc/libboost_regex-gcc-d-1_32.so : gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-d-1_32.so $(LDFLAGS)  gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-d-1_32.so : gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/icu.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o gcc/boost_regex-gcc-d-1_32_shared/usinstances.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-d-1_32.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/icu.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o gcc/boost_regex-gcc-d-1_32_shared/usinstances.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(ICU_LIBS) $(LIBS)
 

build/gcc.mak

@@ -10,6 +10,7 @@
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -28,9 +29,19 @@ C1=-c -O2 -I../../../
 #
 C2=-c -g -I../../../
 
+ifeq "$(ICU_PATH)" ""
+$(warning "Building Boost.Regex without ICU / Unicode support:")
+$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)/include
+ICU_LDFLAGS= -L$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+$(warning "Building Boost.Regex with ICU in $(ICU_PATH)")
+endif
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_32 ./gcc/libboost_regex-gcc-1_32.a gcc gcc/boost_regex-gcc-d-1_32 ./gcc/libboost_regex-gcc-d-1_32.a
 
@@ -49,43 +60,55 @@ install : all
 #
 ########################################################
 gcc/boost_regex-gcc-1_32/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-1_32/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cregex.o $(C1) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-1_32/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-1_32/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-1_32/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/instances.o $(C1) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-1_32/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/posix_api.o $(C1) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-1_32/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex.o $(C1) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-1_32/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_32/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-1_32/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-1_32/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-1_32/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-1_32/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-1_32/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-1_32/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-1_32/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/winstances.o $(C1) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-1_32 : 
 	mkdir -p gcc/boost_regex-gcc-1_32
@@ -93,8 +116,8 @@ gcc/boost_regex-gcc-1_32 :
 boost_regex-gcc-1_32_clean :
 	rm -f gcc/boost_regex-gcc-1_32/*.o
 
-./gcc/libboost_regex-gcc-1_32.a : gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_synch.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
-	ar -r gcc/libboost_regex-gcc-1_32.a  gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_synch.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
+./gcc/libboost_regex-gcc-1_32.a : gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/icu.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-1_32/static_mutex.o gcc/boost_regex-gcc-1_32/usinstances.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wc_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
+	ar -r gcc/libboost_regex-gcc-1_32.a  gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/icu.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-1_32/static_mutex.o gcc/boost_regex-gcc-1_32/usinstances.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wc_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
 	-ar -s gcc/libboost_regex-gcc-1_32.a
 
 ########################################################
@@ -103,43 +126,55 @@ boost_regex-gcc-1_32_clean :
 #
 ########################################################
 gcc/boost_regex-gcc-d-1_32/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/c_regex_traits.o $(C2) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o $(C2) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o $(C2) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cregex.o $(C2) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-d-1_32/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/fileiter.o $(C2) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-d-1_32/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-d-1_32/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/instances.o $(C2) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-d-1_32/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/posix_api.o $(C2) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex.o $(C2) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-d-1_32/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_debug.o $(C2) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_32/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_synch.o $(C2) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-d-1_32/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-d-1_32/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o $(C2) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/winstances.o $(C2) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-d-1_32 : 
 	mkdir -p gcc/boost_regex-gcc-d-1_32
@@ -147,7 +182,7 @@ gcc/boost_regex-gcc-d-1_32 :
 boost_regex-gcc-d-1_32_clean :
 	rm -f gcc/boost_regex-gcc-d-1_32/*.o
 
-./gcc/libboost_regex-gcc-d-1_32.a : gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_synch.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
-	ar -r gcc/libboost_regex-gcc-d-1_32.a  gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_synch.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
+./gcc/libboost_regex-gcc-d-1_32.a : gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/icu.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32/static_mutex.o gcc/boost_regex-gcc-d-1_32/usinstances.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
+	ar -r gcc/libboost_regex-gcc-d-1_32.a  gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/icu.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32/static_mutex.o gcc/boost_regex-gcc-d-1_32/usinstances.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
 	-ar -s gcc/libboost_regex-gcc-d-1_32.a
 

build/gcc_gen.sh

@@ -55,7 +55,7 @@ EOF
 		obj="$subdir/$obj_dir/$obj"
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
-		echo "	\$(CXX) \$(INCLUDES) -o $obj $opts \$(CXXFLAGS) $file" >> $tout
+		echo "	\$(CXX) \$(INCLUDES) -o $obj $opts \$(CXXFLAGS) \$(ICU_CXXFLAGS) $file" >> $tout
 		echo "" >> $tout
 	done
 #
@@ -73,7 +73,7 @@ EOF
 #	 now for the main target for this library:
           if test "$gcc_shared" == "yes"; then
 		echo ./$subdir/lib$libname.so : $all_obj >> $tout
-		echo "	\$(LINKER) -o $subdir/lib$libname.so \$(LDFLAGS) $all_obj \$(LIBS)" >> $tout
+		echo "	\$(LINKER) -o $subdir/lib$libname.so \$(LDFLAGS)  \$(ICU_LDFLAGS) $all_obj \$(ICU_LIBS) \$(LIBS)" >> $tout
 	else
 		echo ./$subdir/lib$libname.a : $all_obj >> $tout
 		echo "	ar -r $subdir/lib$libname.a $all_obj" >> $tout
@@ -115,6 +115,7 @@ function gcc_gen()
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -133,6 +134,16 @@ C1=-c -O2 -I../../../
 #
 C2=-c -g -I../../../
 
+ifeq "\$(ICU_PATH)" ""
+\$(warning "Building Boost.Regex without ICU / Unicode support:")
+\$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+\$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)/include
+ICU_LDFLAGS= -L\$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+\$(warning "Building Boost.Regex with ICU in \$(ICU_PATH)")
+endif
 
 EOF
 	echo "" >> $out
@@ -184,6 +195,7 @@ function gcc_gen_shared()
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -202,6 +214,17 @@ C1=-c -O2 -I../../../ -fPIC
 #
 C2=-c -g -I../../../ -fPIC
 
+ifeq "\$(ICU_PATH)" ""
+\$(warning "Building Boost.Regex without ICU / Unicode support:")
+\$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+\$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)/include
+ICU_LDFLAGS= -L\$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+\$(warning "Building Boost.Regex with ICU in \$(ICU_PATH)")
+endif
+
 EOF
 	echo "" >> $out
 	echo "ALL_HEADER=$header" >> $out
@@ -236,3 +259,4 @@ gcc_gen_shared
 rm -f $tout $iout
 
 
+

build/generic.mak

@@ -26,7 +26,7 @@ C1=-c -O2 -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so
 
@@ -47,9 +47,6 @@ install : all
 $(DIRNAME)/boost_regex/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-$(DIRNAME)/boost_regex/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 $(DIRNAME)/boost_regex/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -59,6 +56,9 @@ $(DIRNAME)/boost_regex/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
 $(DIRNAME)/boost_regex/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
 
+$(DIRNAME)/boost_regex/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/icu.o $(C1) $(CXXFLAGS) ../src/icu.cpp
+
 $(DIRNAME)/boost_regex/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/instances.o $(C1) $(CXXFLAGS) ../src/instances.cpp
 
@@ -71,12 +71,24 @@ $(DIRNAME)/boost_regex/regex.o: ../src/regex.cpp $(ALL_HEADER)
 $(DIRNAME)/boost_regex/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
 
-$(DIRNAME)/boost_regex/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+$(DIRNAME)/boost_regex/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(C1) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+$(DIRNAME)/boost_regex/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(C1) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+$(DIRNAME)/boost_regex/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
+
+$(DIRNAME)/boost_regex/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/usinstances.o $(C1) $(CXXFLAGS) ../src/usinstances.cpp
 
 $(DIRNAME)/boost_regex/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+$(DIRNAME)/boost_regex/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wc_regex_traits.o $(C1) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 $(DIRNAME)/boost_regex/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -89,6 +101,6 @@ $(DIRNAME)/boost_regex :
 boost_regex_clean :
 	rm -f $(DIRNAME)/boost_regex/*.o
 
-./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
-	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
+./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/icu.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/usinstances.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
+	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/icu.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/usinstances.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
 

build/sunpro.mak

@@ -34,7 +34,7 @@ SUNWS_CACHE_NAME=SunWS_cache
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : sunpro sunpro/libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).a sunpro/libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).a sunpro/shared_libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).so sunpro/shared_libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).so
 
@@ -54,9 +54,6 @@ sunpro :
 sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -66,6 +63,9 @@ sunpro/libboost_regex$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
 sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/libboost_regex$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/libboost_regex$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -78,12 +78,24 @@ sunpro/libboost_regex$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -97,8 +109,8 @@ libboost_regex$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/icu.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/icu.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -108,9 +120,6 @@ sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_
 sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -120,6 +129,9 @@ sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
 sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -132,12 +144,24 @@ sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -151,8 +175,8 @@ libboost_regex_mt$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -162,9 +186,6 @@ sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_
 sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -174,6 +195,9 @@ sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HEADE
 sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -186,12 +210,24 @@ sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -205,8 +241,8 @@ libboost_regex$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
 
 ########################################################
 #
@@ -216,9 +252,6 @@ sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -228,6 +261,9 @@ sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HE
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -240,12 +276,24 @@ sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEAD
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -259,6 +307,6 @@ libboost_regex_mt$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
 

build/vc6-stlport.mak

@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -39,8 +43,20 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-mt-sp-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib boost_regex-vc6-mt-p-1_32_dir ./vc6-stlport/boost_regex-vc6-mt-p-1_32.lib libboost_regex-vc6-mt-p-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib boost_regex-vc6-mt-gdp-1_32_dir ./vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib libboost_regex-vc6-mt-sgdp-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib libboost_regex-vc6-mt-gdp-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib
 
@@ -72,43 +88,55 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-sp-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sp-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sp-1_32
@@ -119,8 +147,8 @@ libboost_regex-vc6-mt-sp-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
 
 ########################################################
 #
@@ -128,43 +156,55 @@ libboost_regex-vc6-mt-sp-1_32_clean :
 #
 ########################################################
 vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-p-1_32_dir :
 	@if not exist "vc6-stlport\boost_regex-vc6-mt-p-1_32\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-p-1_32
@@ -175,8 +215,8 @@ boost_regex-vc6-mt-p-1_32_clean :
 	del vc6-stlport\boost_regex-vc6-mt-p-1_32\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-p-1_32\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-p-1_32.lib : vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-p-1_32.lib : vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -184,43 +224,55 @@ boost_regex-vc6-mt-p-1_32_clean :
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-p-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-p-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-p-1_32
@@ -231,8 +283,8 @@ libboost_regex-vc6-mt-p-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -240,43 +292,55 @@ libboost_regex-vc6-mt-p-1_32_clean :
 #
 ########################################################
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-gdp-1_32_dir :
 	@if not exist "vc6-stlport\boost_regex-vc6-mt-gdp-1_32\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-gdp-1_32
@@ -287,8 +351,8 @@ boost_regex-vc6-mt-gdp-1_32_clean :
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_32\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_32\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -296,43 +360,55 @@ boost_regex-vc6-mt-gdp-1_32_clean :
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-sgdp-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32
@@ -343,8 +419,8 @@ libboost_regex-vc6-mt-sgdp-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -352,43 +428,55 @@ libboost_regex-vc6-mt-sgdp-1_32_clean :
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-gdp-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-gdp-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-gdp-1_32
@@ -399,6 +487,6 @@ libboost_regex-vc6-mt-gdp-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
 

build/vc6.mak

@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -35,8 +39,20 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-s-1_32_dir ./vc6/libboost_regex-vc6-s-1_32.lib libboost_regex-vc6-mt-s-1_32_dir ./vc6/libboost_regex-vc6-mt-s-1_32.lib libboost_regex-vc6-sgd-1_32_dir ./vc6/libboost_regex-vc6-sgd-1_32.lib libboost_regex-vc6-mt-sgd-1_32_dir ./vc6/libboost_regex-vc6-mt-sgd-1_32.lib boost_regex-vc6-mt-gd-1_32_dir ./vc6/boost_regex-vc6-mt-gd-1_32.lib boost_regex-vc6-mt-1_32_dir ./vc6/boost_regex-vc6-mt-1_32.lib libboost_regex-vc6-mt-1_32_dir ./vc6/libboost_regex-vc6-mt-1_32.lib libboost_regex-vc6-mt-gd-1_32_dir ./vc6/libboost_regex-vc6-mt-gd-1_32.lib
 
@@ -68,43 +84,55 @@ main_dir :
 #
 ########################################################
 vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-s-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-s-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-s-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-s-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-s-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-s-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-s-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-s-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-s-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-s-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-s-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-s-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-s-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-s-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-s-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-s-1_32
@@ -115,8 +143,8 @@ libboost_regex-vc6-s-1_32_clean :
 	del vc6\libboost_regex-vc6-s-1_32\*.exp
 	del vc6\libboost_regex-vc6-s-1_32\*.pch
 
-./vc6/libboost_regex-vc6-s-1_32.lib : vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
+./vc6/libboost_regex-vc6-s-1_32.lib : vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/icu.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-s-1_32/usinstances.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/icu.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-s-1_32/usinstances.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -124,43 +152,55 @@ libboost_regex-vc6-s-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-s-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-s-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-s-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-s-1_32
@@ -171,8 +211,8 @@ libboost_regex-vc6-mt-s-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-s-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-s-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-s-1_32.lib : vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-s-1_32.lib : vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/icu.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/icu.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -180,43 +220,55 @@ libboost_regex-vc6-mt-s-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-sgd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-sgd-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-sgd-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-sgd-1_32
@@ -227,8 +279,8 @@ libboost_regex-vc6-sgd-1_32_clean :
 	del vc6\libboost_regex-vc6-sgd-1_32\*.exp
 	del vc6\libboost_regex-vc6-sgd-1_32\*.pch
 
-./vc6/libboost_regex-vc6-sgd-1_32.lib : vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
+./vc6/libboost_regex-vc6-sgd-1_32.lib : vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/icu.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/icu.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -236,43 +288,55 @@ libboost_regex-vc6-sgd-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-sgd-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-sgd-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-sgd-1_32
@@ -283,8 +347,8 @@ libboost_regex-vc6-mt-sgd-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-sgd-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-sgd-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-sgd-1_32.lib : vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-sgd-1_32.lib : vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -292,43 +356,55 @@ libboost_regex-vc6-mt-sgd-1_32_clean :
 #
 ########################################################
 vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc6/boost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-gd-1_32_dir :
 	@if not exist "vc6\boost_regex-vc6-mt-gd-1_32\$(NULL)" mkdir vc6\boost_regex-vc6-mt-gd-1_32
@@ -339,8 +415,8 @@ boost_regex-vc6-mt-gd-1_32_clean :
 	del vc6\boost_regex-vc6-mt-gd-1_32\*.exp
 	del vc6\boost_regex-vc6-mt-gd-1_32\*.pch
 
-./vc6/boost_regex-vc6-mt-gd-1_32.lib : vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj
+./vc6/boost_regex-vc6-mt-gd-1_32.lib : vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/icu.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/icu.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj
 
 ########################################################
 #
@@ -348,43 +424,55 @@ boost_regex-vc6-mt-gd-1_32_clean :
 #
 ########################################################
 vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/boost_regex-vc6-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
 
 vc6/boost_regex-vc6-mt-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+
+vc6/boost_regex-vc6-mt-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/icu.cpp
 
 vc6/boost_regex-vc6-mt-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
 
 vc6/boost_regex-vc6-mt-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
 
 vc6/boost_regex-vc6-mt-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
 
 vc6/boost_regex-vc6-mt-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_synch.cpp
+vc6/boost_regex-vc6-mt-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/boost_regex-vc6-mt-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/boost_regex-vc6-mt-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc6/boost_regex-vc6-mt-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/usinstances.cpp
 
 vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/boost_regex-vc6-mt-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/boost_regex-vc6-mt-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-1_32_dir :
 	@if not exist "vc6\boost_regex-vc6-mt-1_32\$(NULL)" mkdir vc6\boost_regex-vc6-mt-1_32
@@ -395,8 +483,8 @@ boost_regex-vc6-mt-1_32_clean :
 	del vc6\boost_regex-vc6-mt-1_32\*.exp
 	del vc6\boost_regex-vc6-mt-1_32\*.pch
 
-./vc6/boost_regex-vc6-mt-1_32.lib : vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/winstances.obj
+./vc6/boost_regex-vc6-mt-1_32.lib : vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/icu.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-1_32/usinstances.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/icu.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-1_32/usinstances.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -404,43 +492,55 @@ boost_regex-vc6-mt-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-1_32
@@ -451,8 +551,8 @@ libboost_regex-vc6-mt-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-1_32.lib : vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-1_32.lib : vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/icu.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/icu.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -460,43 +560,55 @@ libboost_regex-vc6-mt-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-gd-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-gd-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-gd-1_32
@@ -507,6 +619,6 @@ libboost_regex-vc6-mt-gd-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-gd-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-gd-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-gd-1_32.lib : vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-gd-1_32.lib : vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/icu.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/icu.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
 

build/vc7-stlport.mak

@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -39,8 +43,20 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-mt-sp-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib boost_regex-vc7-mt-p-1_32_dir ./vc7-stlport/boost_regex-vc7-mt-p-1_32.lib libboost_regex-vc7-mt-p-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib boost_regex-vc7-mt-gdp-1_32_dir ./vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib libboost_regex-vc7-mt-sgdp-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib libboost_regex-vc7-mt-gdp-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib
 
@@ -72,43 +88,55 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-sp-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sp-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sp-1_32
@@ -119,8 +147,8 @@ libboost_regex-vc7-mt-sp-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
 
 ########################################################
 #
@@ -128,43 +156,55 @@ libboost_regex-vc7-mt-sp-1_32_clean :
 #
 ########################################################
 vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-p-1_32_dir :
 	@if not exist "vc7-stlport\boost_regex-vc7-mt-p-1_32\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-p-1_32
@@ -175,8 +215,8 @@ boost_regex-vc7-mt-p-1_32_clean :
 	del vc7-stlport\boost_regex-vc7-mt-p-1_32\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-p-1_32\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-p-1_32.lib : vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-p-1_32.lib : vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -184,43 +224,55 @@ boost_regex-vc7-mt-p-1_32_clean :
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-p-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-p-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-p-1_32
@@ -231,8 +283,8 @@ libboost_regex-vc7-mt-p-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -240,43 +292,55 @@ libboost_regex-vc7-mt-p-1_32_clean :
 #
 ########################################################
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-gdp-1_32_dir :
 	@if not exist "vc7-stlport\boost_regex-vc7-mt-gdp-1_32\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-gdp-1_32
@@ -287,8 +351,8 @@ boost_regex-vc7-mt-gdp-1_32_clean :
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_32\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_32\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -296,43 +360,55 @@ boost_regex-vc7-mt-gdp-1_32_clean :
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-sgdp-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32
@@ -343,8 +419,8 @@ libboost_regex-vc7-mt-sgdp-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -352,43 +428,55 @@ libboost_regex-vc7-mt-sgdp-1_32_clean :
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-gdp-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-gdp-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-gdp-1_32
@@ -399,6 +487,6 @@ libboost_regex-vc7-mt-gdp-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
 

build/vc7.mak

@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -35,8 +39,20 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-s-1_32_dir ./vc7/libboost_regex-vc7-s-1_32.lib libboost_regex-vc7-mt-s-1_32_dir ./vc7/libboost_regex-vc7-mt-s-1_32.lib libboost_regex-vc7-sgd-1_32_dir ./vc7/libboost_regex-vc7-sgd-1_32.lib libboost_regex-vc7-mt-sgd-1_32_dir ./vc7/libboost_regex-vc7-mt-sgd-1_32.lib boost_regex-vc7-mt-gd-1_32_dir ./vc7/boost_regex-vc7-mt-gd-1_32.lib boost_regex-vc7-mt-1_32_dir ./vc7/boost_regex-vc7-mt-1_32.lib libboost_regex-vc7-mt-1_32_dir ./vc7/libboost_regex-vc7-mt-1_32.lib libboost_regex-vc7-mt-gd-1_32_dir ./vc7/libboost_regex-vc7-mt-gd-1_32.lib
 
@@ -68,43 +84,55 @@ main_dir :
 #
 ########################################################
 vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-s-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-s-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-s-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-s-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-s-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-s-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-s-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-s-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-s-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-s-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-s-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-s-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-s-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-s-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-s-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-s-1_32
@@ -115,8 +143,8 @@ libboost_regex-vc7-s-1_32_clean :
 	del vc7\libboost_regex-vc7-s-1_32\*.exp
 	del vc7\libboost_regex-vc7-s-1_32\*.pch
 
-./vc7/libboost_regex-vc7-s-1_32.lib : vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
+./vc7/libboost_regex-vc7-s-1_32.lib : vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/icu.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-s-1_32/usinstances.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/icu.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-s-1_32/usinstances.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -124,43 +152,55 @@ libboost_regex-vc7-s-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-s-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-s-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-s-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-s-1_32
@@ -171,8 +211,8 @@ libboost_regex-vc7-mt-s-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-s-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-s-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-s-1_32.lib : vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-s-1_32.lib : vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/icu.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/icu.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -180,43 +220,55 @@ libboost_regex-vc7-mt-s-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-sgd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-sgd-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-sgd-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-sgd-1_32
@@ -227,8 +279,8 @@ libboost_regex-vc7-sgd-1_32_clean :
 	del vc7\libboost_regex-vc7-sgd-1_32\*.exp
 	del vc7\libboost_regex-vc7-sgd-1_32\*.pch
 
-./vc7/libboost_regex-vc7-sgd-1_32.lib : vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
+./vc7/libboost_regex-vc7-sgd-1_32.lib : vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/icu.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/icu.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -236,43 +288,55 @@ libboost_regex-vc7-sgd-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-sgd-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-sgd-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-sgd-1_32
@@ -283,8 +347,8 @@ libboost_regex-vc7-mt-sgd-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-sgd-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-sgd-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-sgd-1_32.lib : vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-sgd-1_32.lib : vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -292,43 +356,55 @@ libboost_regex-vc7-mt-sgd-1_32_clean :
 #
 ########################################################
 vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc7/boost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-gd-1_32_dir :
 	@if not exist "vc7\boost_regex-vc7-mt-gd-1_32\$(NULL)" mkdir vc7\boost_regex-vc7-mt-gd-1_32
@@ -339,8 +415,8 @@ boost_regex-vc7-mt-gd-1_32_clean :
 	del vc7\boost_regex-vc7-mt-gd-1_32\*.exp
 	del vc7\boost_regex-vc7-mt-gd-1_32\*.pch
 
-./vc7/boost_regex-vc7-mt-gd-1_32.lib : vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj
+./vc7/boost_regex-vc7-mt-gd-1_32.lib : vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/icu.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/icu.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj
 
 ########################################################
 #
@@ -348,43 +424,55 @@ boost_regex-vc7-mt-gd-1_32_clean :
 #
 ########################################################
 vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/boost_regex-vc7-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
 
 vc7/boost_regex-vc7-mt-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+
+vc7/boost_regex-vc7-mt-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/icu.cpp
 
 vc7/boost_regex-vc7-mt-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
 
 vc7/boost_regex-vc7-mt-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
 
 vc7/boost_regex-vc7-mt-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
 
 vc7/boost_regex-vc7-mt-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_synch.cpp
+vc7/boost_regex-vc7-mt-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/boost_regex-vc7-mt-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/boost_regex-vc7-mt-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc7/boost_regex-vc7-mt-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/usinstances.cpp
 
 vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/boost_regex-vc7-mt-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/boost_regex-vc7-mt-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-1_32_dir :
 	@if not exist "vc7\boost_regex-vc7-mt-1_32\$(NULL)" mkdir vc7\boost_regex-vc7-mt-1_32
@@ -395,8 +483,8 @@ boost_regex-vc7-mt-1_32_clean :
 	del vc7\boost_regex-vc7-mt-1_32\*.exp
 	del vc7\boost_regex-vc7-mt-1_32\*.pch
 
-./vc7/boost_regex-vc7-mt-1_32.lib : vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/winstances.obj
+./vc7/boost_regex-vc7-mt-1_32.lib : vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/icu.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-1_32/usinstances.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/icu.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-1_32/usinstances.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -404,43 +492,55 @@ boost_regex-vc7-mt-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-1_32
@@ -451,8 +551,8 @@ libboost_regex-vc7-mt-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-1_32.lib : vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-1_32.lib : vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/icu.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/icu.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -460,43 +560,55 @@ libboost_regex-vc7-mt-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-gd-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-gd-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-gd-1_32
@@ -507,6 +619,6 @@ libboost_regex-vc7-mt-gd-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-gd-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-gd-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-gd-1_32.lib : vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-gd-1_32.lib : vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/icu.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/icu.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
 

build/vc71-stlport.mak

@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -39,8 +43,20 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-mt-sp-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib boost_regex-vc71-mt-p-1_32_dir ./vc71-stlport/boost_regex-vc71-mt-p-1_32.lib libboost_regex-vc71-mt-p-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib boost_regex-vc71-mt-gdp-1_32_dir ./vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib libboost_regex-vc71-mt-sgdp-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib libboost_regex-vc71-mt-gdp-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib
 
@@ -72,43 +88,55 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-sp-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sp-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sp-1_32
@@ -119,8 +147,8 @@ libboost_regex-vc71-mt-sp-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
 
 ########################################################
 #
@@ -128,43 +156,55 @@ libboost_regex-vc71-mt-sp-1_32_clean :
 #
 ########################################################
 vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-p-1_32_dir :
 	@if not exist "vc71-stlport\boost_regex-vc71-mt-p-1_32\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-p-1_32
@@ -175,8 +215,8 @@ boost_regex-vc71-mt-p-1_32_clean :
 	del vc71-stlport\boost_regex-vc71-mt-p-1_32\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-p-1_32\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-p-1_32.lib : vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-p-1_32.lib : vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -184,43 +224,55 @@ boost_regex-vc71-mt-p-1_32_clean :
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-p-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-p-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-p-1_32
@@ -231,8 +283,8 @@ libboost_regex-vc71-mt-p-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -240,43 +292,55 @@ libboost_regex-vc71-mt-p-1_32_clean :
 #
 ########################################################
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-gdp-1_32_dir :
 	@if not exist "vc71-stlport\boost_regex-vc71-mt-gdp-1_32\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-gdp-1_32
@@ -287,8 +351,8 @@ boost_regex-vc71-mt-gdp-1_32_clean :
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_32\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_32\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -296,43 +360,55 @@ boost_regex-vc71-mt-gdp-1_32_clean :
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-sgdp-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32
@@ -343,8 +419,8 @@ libboost_regex-vc71-mt-sgdp-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -352,43 +428,55 @@ libboost_regex-vc71-mt-sgdp-1_32_clean :
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-gdp-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-gdp-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-gdp-1_32
@@ -399,6 +487,6 @@ libboost_regex-vc71-mt-gdp-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
 

build/vc71.mak

@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -35,8 +39,20 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-s-1_32_dir ./vc71/libboost_regex-vc71-s-1_32.lib libboost_regex-vc71-mt-s-1_32_dir ./vc71/libboost_regex-vc71-mt-s-1_32.lib libboost_regex-vc71-sgd-1_32_dir ./vc71/libboost_regex-vc71-sgd-1_32.lib libboost_regex-vc71-mt-sgd-1_32_dir ./vc71/libboost_regex-vc71-mt-sgd-1_32.lib boost_regex-vc71-mt-gd-1_32_dir ./vc71/boost_regex-vc71-mt-gd-1_32.lib boost_regex-vc71-mt-1_32_dir ./vc71/boost_regex-vc71-mt-1_32.lib libboost_regex-vc71-mt-1_32_dir ./vc71/libboost_regex-vc71-mt-1_32.lib libboost_regex-vc71-mt-gd-1_32_dir ./vc71/libboost_regex-vc71-mt-gd-1_32.lib
 
@@ -68,43 +84,55 @@ main_dir :
 #
 ########################################################
 vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-s-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-s-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-s-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-s-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-s-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-s-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-s-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-s-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-s-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-s-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-s-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-s-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-s-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-s-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-s-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-s-1_32
@@ -115,8 +143,8 @@ libboost_regex-vc71-s-1_32_clean :
 	del vc71\libboost_regex-vc71-s-1_32\*.exp
 	del vc71\libboost_regex-vc71-s-1_32\*.pch
 
-./vc71/libboost_regex-vc71-s-1_32.lib : vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
+./vc71/libboost_regex-vc71-s-1_32.lib : vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/icu.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-s-1_32/usinstances.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/icu.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-s-1_32/usinstances.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -124,43 +152,55 @@ libboost_regex-vc71-s-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-s-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-s-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-s-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-s-1_32
@@ -171,8 +211,8 @@ libboost_regex-vc71-mt-s-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-s-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-s-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-s-1_32.lib : vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-s-1_32.lib : vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/icu.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/icu.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -180,43 +220,55 @@ libboost_regex-vc71-mt-s-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-sgd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-sgd-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-sgd-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-sgd-1_32
@@ -227,8 +279,8 @@ libboost_regex-vc71-sgd-1_32_clean :
 	del vc71\libboost_regex-vc71-sgd-1_32\*.exp
 	del vc71\libboost_regex-vc71-sgd-1_32\*.pch
 
-./vc71/libboost_regex-vc71-sgd-1_32.lib : vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
+./vc71/libboost_regex-vc71-sgd-1_32.lib : vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/icu.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/icu.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -236,43 +288,55 @@ libboost_regex-vc71-sgd-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-sgd-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-sgd-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-sgd-1_32
@@ -283,8 +347,8 @@ libboost_regex-vc71-mt-sgd-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-sgd-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-sgd-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-sgd-1_32.lib : vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-sgd-1_32.lib : vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -292,43 +356,55 @@ libboost_regex-vc71-mt-sgd-1_32_clean :
 #
 ########################################################
 vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc71/boost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-gd-1_32_dir :
 	@if not exist "vc71\boost_regex-vc71-mt-gd-1_32\$(NULL)" mkdir vc71\boost_regex-vc71-mt-gd-1_32
@@ -339,8 +415,8 @@ boost_regex-vc71-mt-gd-1_32_clean :
 	del vc71\boost_regex-vc71-mt-gd-1_32\*.exp
 	del vc71\boost_regex-vc71-mt-gd-1_32\*.pch
 
-./vc71/boost_regex-vc71-mt-gd-1_32.lib : vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj
+./vc71/boost_regex-vc71-mt-gd-1_32.lib : vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/icu.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/icu.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj
 
 ########################################################
 #
@@ -348,43 +424,55 @@ boost_regex-vc71-mt-gd-1_32_clean :
 #
 ########################################################
 vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/boost_regex-vc71-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
 
 vc71/boost_regex-vc71-mt-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+
+vc71/boost_regex-vc71-mt-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/icu.cpp
 
 vc71/boost_regex-vc71-mt-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
 
 vc71/boost_regex-vc71-mt-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
 
 vc71/boost_regex-vc71-mt-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
 
 vc71/boost_regex-vc71-mt-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_synch.cpp
+vc71/boost_regex-vc71-mt-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/boost_regex-vc71-mt-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/boost_regex-vc71-mt-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc71/boost_regex-vc71-mt-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/usinstances.cpp
 
 vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/boost_regex-vc71-mt-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/boost_regex-vc71-mt-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-1_32_dir :
 	@if not exist "vc71\boost_regex-vc71-mt-1_32\$(NULL)" mkdir vc71\boost_regex-vc71-mt-1_32
@@ -395,8 +483,8 @@ boost_regex-vc71-mt-1_32_clean :
 	del vc71\boost_regex-vc71-mt-1_32\*.exp
 	del vc71\boost_regex-vc71-mt-1_32\*.pch
 
-./vc71/boost_regex-vc71-mt-1_32.lib : vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/winstances.obj
+./vc71/boost_regex-vc71-mt-1_32.lib : vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/icu.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-1_32/usinstances.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/icu.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-1_32/usinstances.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -404,43 +492,55 @@ boost_regex-vc71-mt-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-1_32
@@ -451,8 +551,8 @@ libboost_regex-vc71-mt-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-1_32.lib : vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-1_32.lib : vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/icu.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/icu.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -460,43 +560,55 @@ libboost_regex-vc71-mt-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-gd-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-gd-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-gd-1_32
@@ -507,6 +619,6 @@ libboost_regex-vc71-mt-gd-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-gd-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-gd-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-gd-1_32.lib : vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-gd-1_32.lib : vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/icu.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/icu.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
 

build/vc_gen.sh

@@ -46,7 +46,7 @@ EOF
 		obj="$subdir$stlport_suffix/$libname/$obj"
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
-		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
+		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) \$(ICU_COMPILE_OPTS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
 		echo "" >> $tout
 	done
 #
@@ -96,7 +96,7 @@ EOF
 		obj="$subdir$stlport_suffix/$libname/$obj"
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
-		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
+		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) \$(ICU_COMPILE_OPTS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
 		echo "" >> $tout
 	done
 #
@@ -116,7 +116,7 @@ EOF
 #
 #	 now for the main target for this library:
 	echo ./$subdir$stlport_suffix/$libname.lib : $all_obj >> $tout
-	echo "	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:\"$subdir$stlport_suffix/$libname.pdb\" /debug /machine:I386 /out:\"$subdir$stlport_suffix/$libname.dll\" /implib:\"$subdir$stlport_suffix/$libname.lib\" /LIBPATH:\$(STLPORT_PATH)\\lib \$(XLFLAGS) $all_obj" >> $tout
+	echo "	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:\"$subdir$stlport_suffix/$libname.pdb\" /debug /machine:I386 /out:\"$subdir$stlport_suffix/$libname.dll\" /implib:\"$subdir$stlport_suffix/$libname.lib\" /LIBPATH:\$(STLPORT_PATH)\\lib \$(XLFLAGS) \$(ICU_LINK_OPTS) $all_obj" >> $tout
 	echo "" >> $tout
 }
 
@@ -181,6 +181,10 @@ function vc6_gen()
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -208,6 +212,18 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "\$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)\\include
+ICU_LINK_OPTS= /LIBPATH:\$(ICU_PATH)\\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in \$(ICU_PATH)
+!ENDIF
+
 EOF
 	echo "" >> $out
 	echo "ALL_HEADER=$header" >> $out
@@ -289,6 +305,10 @@ function vc6_stlp_gen()
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -320,6 +340,18 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "\$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)\\include
+ICU_LINK_OPTS= /LIBPATH:\$(ICU_PATH)\\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in \$(ICU_PATH)
+!ENDIF
+
 EOF
 	echo "" >> $out
 	echo "ALL_HEADER=$header" >> $out
@@ -368,8 +400,6 @@ subdir="vc7"
 vc6_gen
 #
 # generate vc7-stlport makefile:
-debug_extra="/GX /RTC1"
-release_extra=""
 is_stlport="yes"
 out="vc7-stlport.mak"
 no_single="yes"
@@ -377,8 +407,6 @@ subdir="vc7"
 vc6_stlp_gen
 #
 # generate vc71 makefile:
-debug_extra="/GX /RTC1 /Zc:wchar_t"
-release_extra="/Zc:wchar_t"
 is_stlport="no"
 out="vc71.mak"
 no_single="no"
@@ -386,8 +414,6 @@ subdir="vc71"
 vc6_gen
 #
 # generate vc71-stlport makefile:
-debug_extra="/GX /RTC1"
-release_extra=""
 is_stlport="yes"
 out="vc71-stlport.mak"
 no_single="yes"
@@ -406,4 +432,3 @@ rm -f $tout $iout
 
 
 
-